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

[Aaron Bentley]

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

Robert Collins wrote:
>> Please describe a use case in which it will be slower, then.  The only
>> one I can think of is merge --force --weave.
> 
> Any time you have two parents. I don't know this part of the code base
> well enough to say what will trigger that.

I'm confident there are no common cases.  merge --force --weave is the
only case I can think of.

> And we're pretty close to being able to get that trivially; I wonder if
> there would be (at this point in time) a performance difference by doing
> this for regular 'merge --weave'

I'd expect that the performance cost of loading a knit index would dwarf
the performance improvement from avoiding the ancestry calls.  But on
your GraphIndex, there might be an improvement.

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

iD8DBQFGoCQ70F+nu1YWqI0RAtIdAKCIGrz8kc6Yz3rBNaBgRbVP7PImDQCfZCFu
bTsOd0pwjdkNvQhIBCwcuqk=
=osmb
-----END PGP SIGNATURE-----