merge --reprocess implemented

[Aaron Bentley]

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

Hi all,

I've just pushed --reprocess support for bzr merge.  It should reduce
the number of spurious conflicts.  It works by taking conflicted
sections (as identified by Merge3), and doing a two-way merge on the
THIS and OTHER texts.  After this is done, you can be sure that any
conflicting lines really are different.

Unfortunately, this operation makes it impossible to find the section of
BASE that was associated with each "real" conflict, because the BASE for
a conflict section has no lines in common with THIS or OTHER.

So --show-base and --reprocess are mutually exclusive.

Also, this is implemented solely in terms of Merge3.  If we wanted to do
something similar for weave merge, we'd have to change the
implementation significantly.  It's not clear to me how important it is
when weave merging.

It can be found in the standard place:
http://panoramicfeedback.com/opensource/bzr/bzr.ab/

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

iD8DBQFDYXht0F+nu1YWqI0RAoO5AJ476FlTYRv9dhr48nG9GE59OjWJgwCeN55n
st9IITeRxtBZ4tkWzJKFupI=
=rtug
-----END PGP SIGNATURE-----