[RFC] Cherry-picking, reordering revisions and 2D versioning

[Aaron Bentley]

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

Jan Hudec wrote:
> Well, weave-merging is kind-of 3-way merging with per-line bases. And
> certainly weave-merge reduces to 3-way merge where the base is defined
> (which it is not in presence of cherry-picks).

That's not accurate.  See here: http://bazaar.canonical.com/BzrWeaveFormat

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

iD8DBQFDzQ6c0F+nu1YWqI0RAjL9AJwOEBA/TaRTj9AIipjtD+SlTy23VACfc2zm
t516fYzXO1vYi3C1YvbvvmY=
=5fgm
-----END PGP SIGNATURE-----