[MERGE REVIEW] --reprocess support for weaves

[Aaron Bentley]

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

Hi all,

This patch does a number of things:
1. Refactor some of the weave merging functionality into TextMerge
2. Change the output of a weave merge into a more structured format,
leaving text output to TextMerge
3. Implement a two-way merge (Merge2) that can operate on the structured
merge output
4. Refactor more weave code into PlanWeaveMerge and WeaveMerge
5. Implement weave reprocessing in terms of Merge2, for both merge and
remerge.
6. Implement conflict detection in terms of the structured merge output

You may find the branch itself more comprehensible than the patch.  It's at
http://code.aaronbentley.com/bzr/bzrrepo/bzr.ab/

A future possibility would be to turn Merge3 into a child of TextMerge.
~ Or heck, even Diff3Merge, if we want.

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

iD8DBQFEOGGk0F+nu1YWqI0RAlQDAJ4v2mII/oMRRYa00Ljikx4lhZ/E6wCbBJG3
Jt1zgI7yQHFG+piLW5G7JFk=
=MYbs
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: weave-reprocess.patch
Type: text/x-patch
Size: 27569 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060408/7e67b794/attachment.bin