star or parallele merge

[Aaron Bentley]

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

David Allouche wrote:
> That is what star-merge does. But in practise, it often conflicts in
> criss-cross situations (for reasons that are not entirely clear to me).

You shouldn't get conflicts if you do star-merge --three-way, but the
default diff/patch doesn't handle this case: THIS = "A", BASE = "B"
OTHER = "A"

> Smarter merge base selection algorithms properly pick the closest
> unambiguous ancestor as merge base and cause a conflict. Aaaron Bentley
> designed an algorithm with a tongue twisting name that has this
> property.

I don't remember doing that.  If you mean "shortest-longest path", or
"perhipheral merge", those didn't do it.  I did have a variant of
star-merge that could at least *detect* criss-cross and give up...

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

iD8DBQFDQ80G0F+nu1YWqI0RApEUAJ9XczzF0M3Z+VoOs20oIul128nnvACcDvve
f34WV0fjmyTg6KuAF1CtbQg=
=JfEw
-----END PGP SIGNATURE-----