Supporting cherry-picking

[Aaron Bentley]

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

Matthieu Moy wrote:
> I'll probably cherrypick revno 12 immediately, wait for A to be
> finished, then cherrypick revno 11

Actually, you can't cherrypick 11, because 10 has already been merged--
bzr merge -r10..11 has the same effect as bzr merge -r11.

However you're right about the rest of it.

> Perhaps there could be a separate "cherrypick history" that would have
> no influence on merging but that would be converted to the usual merge
> history when contiguous patches from the common ancestor are merged.

Yes, I think this was always the plan, but we haven't got any kind of
spec yet.

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

iD8DBQFDXmsb0F+nu1YWqI0RAjsdAJ93cH0GR3gfmh+SWUBDfWQIHDaHggCfaveK
hTF94kZpytknVXhKiMbDB9M=
=thgy
-----END PGP SIGNATURE-----