[MERGE] Cherrypick support for annotate merge

Aaron Bentley aaron.bentley at utoronto.ca
Mon Dec 10 00:08:57 GMT 2007


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

Hi all,

This patch adds support for cherrypicks to annotate merge.  For me, this
is enough to make annotate merge a plausible default merge algorithm.

In order to cherrypick x..y into z, it plans two merges:
merge x into z, and merge y into z.  The first plan is then subtracted
from the second.  That is, all common changes are deactivated, leaving
only the changes introduced by y and its ancestors until x.

This technique does not support reverse cherrypicking.  I don't
currently have a theory of how weave merge could support that.

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

iD8DBQFHXIOZ0F+nu1YWqI0RAqyDAJ0UA7fKFuGaBGPD/C5NnBAYH6baJACfd6g1
J7ad+/bu0sLp5KRzMXN/9kg=
=nfo8
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-mail-UIP-_1.patch
Type: text/x-diff
Size: 22048 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071209/054de34f/attachment-0001.bin 


More information about the bazaar mailing list