[MERGE] Implement Tree.plan_merge, deprecate RevisionTree.get_weave

[Aaron Bentley]

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

John Arbash Meinel wrote:
> John Arbash Meinel has voted +1 (conditional).
> Status is now: Conditionally approved
> Comment:
> +1 modulo the discussion between you and Robert about how to get the
> parents correct.

Okay.

> I think you actually want to report the parent ids as all ids except for
> the one you are merging.

Correct.

> Then again, I thought 'bzr remerge' was disabled in the case of having
>>1 merge parents.

Exactly.

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

iD8DBQFGn90u0F+nu1YWqI0RAlSiAJ9bNhDiTO3HMNfrfjjW45iXBGCmgQCdEBhP
pjXXqK0AToS+2+QA8v1su/w=
=a95P
-----END PGP SIGNATURE-----