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

[Aaron Bentley]

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

Hi all,

This patch implements Tree.plan_merge.  Annotate merge was the sole use
of the RevisionTree.get_weave API.  Since we want to deprecate the use
of versionedfiles in public APIs, this patch also deprecates
RevisionTree.get_weave and DirStateRevisionTree.get_weave.

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.

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

iD8DBQFGnSZB0F+nu1YWqI0RAjYCAJsHwehkd7AG1oGxFUTZ5siR0rzQcwCfTilV
ajZtRu0SZ+oC2s6EDSmPdIc=
=wuc2
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: tree-plan-merge.patch
Type: text/x-patch
Size: 50632 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070717/b474050d/attachment-0001.bin