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

[Robert Collins]

On Tue, 2007-07-17 at 16:27 -0400, Aaron Bentley wrote:
> 
> This change also make annotation-based merge more powerful.  Because
> WorkingTree supports annotation, it is now possible to perform an
> annotation-based merge on working trees with uncommitted changes.  I
> will grant that this is not especially useful, but it does make
> annotate
> merge more consistent with other merge types. 

I think this is cool.

I haven't read the full patch yet - if my mail syncs properly I will on
the next flight and give you a review.

One thing stands out right now. To me a method 'plan_merge' on Tree
suggests a tree scope merge - that is one that deals with tree shape not
file content.

Can I suggest something like
plan_file_merge ?

-Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070718/3679649d/attachment.pgp