Bzr and cherrypicking (was Re: revert/shelf/undo/redo)

[Aaron Bentley]

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

Matthieu Moy wrote:
> I suppose the merge itself is easy, but how is the merge history
> recorded then?

It's not recorded at all, which isn't great, but it's better than
recording it as a full merge and those are our only options at present.

> What happens if I do a "normal" merge afterwards? (will
> rev 82 be considered as the common ancestor?)

No.  Perhaps merge3 (the native diff3) will recognize that you've made
the same change in both branches and you won't get conflicts, but there
are no guarantees.

> AAUI, weaves will also allow better merging capabilities when
> cherrypick and full merges are mixed. Is it true?

Yes, that's right.

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

iD8DBQFDVqqp0F+nu1YWqI0RArp9AJ96YWyuAHF5Oy9YwU5HbnRFMugBDgCggHiQ
JM9khQ1OARGxRWjv8Vi7ki0=
=lMCe
-----END PGP SIGNATURE-----