[MERGE][bug #48623]

[David Clymer]

On Tue, 2007-05-01 at 18:34 -0400, David Clymer wrote:
> Hopefully this addresses the issue of ignoring versioned files in a
> satisfactory way.
> 

It seems that (according to the launchpad comments) people prefer the
"warn only" method. I've implemented that approach.

Here's a new and improved version + a test!

-davidc

-- 
gpg-key: http://www.zettazebra.com/files/key.gpg
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bug-48623.patch
Type: text/x-patch
Size: 2237 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070501/97c77ca5/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070501/97c77ca5/attachment.pgp