[MERGE] Merge handles renamed-and-deleted files correctly (Bug #110279)
aaron.bentley at utoronto.ca
Wed Jun 6 02:16:48 BST 2007
-----BEGIN PGP SIGNED MESSAGE-----
This fixes Merge3Merger.cook_conflicts to correctly handle conflicts
where a file is deleted in the local tree, but renamed in the remote branch.
Yes, it's a long-standing bug, resolved with a one-liner. My apologies.
It took me a long time to realize that it was actually correct to have
the parent-id set to non-None, while the name was set to None.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Size: 3581 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070605/e2e39edf/attachment.bin
More information about the bazaar