[BUG] bzr merge-revert fails to clean up working inventory

Aaron Bentley aaron.bentley at utoronto.ca
Tue Jun 28 22:36:21 BST 2005


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

John A Meinel wrote:
> Try this:

Oh, you don't know how many times I've done that.  Drives me nuts.

The merge code has several problems, but it's biggest one is that it
equates inventory adds with file creation and inventory removals with
file deletion.

I've got a branch that correctly separates these two things, but it
needs more polish before I can submit it.

Aaron

P.S. the remove thing is also my fault.  I must be some kinda masochist.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFCwcLV0F+nu1YWqI0RAuf9AJ0TQhHhdxJ8DUxq/dI4ejusn14UAwCfTZV7
VLpWti3E5qC5OzmW2YxWxI8=
=Dj/h
-----END PGP SIGNATURE-----




More information about the bazaar mailing list