"0 conflicts encountered."

[Aaron Bentley]

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

John A Meinel wrote:
> Certainly we still have the bug that diff3 conflicts are reported in the
> old locations rather than the new ones.
 And now it doesn't even tell you
> that it moved anything.
>
> Also, if we keep --merge-type=diff3 the default, can we include
> --reprocess as the default as well? It is a lot nicer. (Naturally,
> supplying --show-base would turn it off).
>
> And when are we thinking to switch to --merge-type=weave?
>
> John
> =:->
>


Merge is a three-phase process:
1. apply text changes
2. apply deletions, and move any renamed files to temporary locations
3. apply creations, and move any renamed files to their new locations

Since we can get conflicts during 2 and 3, we don't know twhat the
filename is when we note the conflict in 1.

It is important to do phase 1 first if OTHER or BASE is a working tree.
 Because it may be an alias of THIS.  And if so, then doing renames or
deletes could get rid of one of the merge texts before we have a chance
to use it.

I think there are ways to solve this, given enough will.  We could delay
the conflict messages until we know the new names, for example.

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

iD8DBQFDkLy50F+nu1YWqI0RAhzSAJ9wUku4ikAKSA00gJyMKTmqGxfgGwCfUnLo
r7H1K/Sfhc3veFGLCZWH+eI=
=c/BD
-----END PGP SIGNATURE-----