bzr merge usability tweakage

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

As promised, I've updated merge to refuse to operate when uncomitted
changes are present in the tree.  I actually had a use case for that,
reverting local changes using 'bzr merge ./@ .', so I've introduced a
'revert' command to restore the functionality I'd otherwise lose.

I've also introduced some basic messages that are spewed when conflicts
are encountered.  I should note that this is in no way the final word on
conflict handling.  In particular, I'd like something like bazaar's
conflict/resolved handling.  But I'm still just throwing exceptions when
you try to delete a non-empty directory, for example.

Enjoy!

Aaron

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFCloDB0F+nu1YWqI0RAjG8AJ9AoQ88kB3LVzh/15ZpC9o9POKclwCaA1Po
gkDiUaKIlSx2tqVdvYqq5Rg=
=u+nA
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: conflict_warnings.patch
Type: text/x-patch
Size: 5009 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050526/f4a2d66f/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: no_changes.patch
Type: text/x-patch
Size: 2090 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050526/f4a2d66f/attachment-0001.bin