Comment 7 for bug 562669

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

Robert Collins wrote:
> Would having --reprocess turn it off be sufficient?
>

At the moment we default to --reprocess being on, because it generally
provides a more sane region of conflict. If you supply --show-base then
we disable --reprocess. If you supply both, then it complains.

In general, I find --reprocess more useful than --show-base, which is
why we defaulted that way.

The specifics as to why --reprocess and --show-base are incompatible.
Specifically, --reprocess finds common regions in THIS and OTHER in the
conflicted areas. But those are not common to BASE otherwise it would
not have conflicted.

Imagine:

BASE: abc
THIS: adefc
OTHER: axefyc

In this case merge will give:

a
<<<<
d
e
f
=====
x
e
f
y
>>>>>
c

- --reprocess will give

a
<<<<
d
=====
x
>>>>>
e
f
<<<<<
=====
y
>>>>>
c

Show base would give:
a
<<<<
d
e
f
|||||
b
=====
x
e
f
y
>>>>>
c

But where does 'b' go after --reprocess?

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkvYpKUACgkQJdeBCYSNAAP0AgCgsYFud7QDminijJXrNLBMsC4B
wxsAn2PQy4VVxd/Oc7gS31AZ9Jt9w8a6
=yWua
-----END PGP SIGNATURE-----