Experimental weave merge support available

[Aaron Bentley]

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

Hi all,

In a transparent attempt to steal Martin's thunder, I have gone and
integrated weave merge into my branch:

http://panoramicfeedback.com/opensource/bzr/bzr.ab/

To try it out, do
bzr merge --merge-type weave $BRANCH

Weave merges are nifty because they have a clearer sense of line
identity and are better-able to handle cherry-picking and other
complicated merge scenarios.

One difference is that because weave merges aren't three-way merges,
they dump only foo.THIS and foo.OTHER on conflicts (and foo gets
standard herringbone conflict markers).  They have no BASE to dump.

This is all based on Martin's work.  I just integrated it into the
current merge architecture.  That means only the textual aspect is done
using weave merge, and things like file renames and the executable bit
still use three-way merging.

The purpose of providing this option is to get additional testing for
weave merging.  Once we're satisfied with it, I expect weave merging
will become the default.

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

iD8DBQFDXCu70F+nu1YWqI0RAnnyAJ9EHBRWBwJ5cEBHHPPxdKsfZ8NSaQCeK43D
mbkz6WZeI3ZZJ10Ic7SCypM=
=yzuI
-----END PGP SIGNATURE-----