More merge base discussion [was: monotone's LCA+DOM algo for selecting a merge base]

[Aaron Bentley]

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

Aaron Bentley wrote:
> The thing is that if C is at all old, the two lines will have resolved
> its conflicts differently, and so they'll conflict on the resolutions.
> But I guess that's true no matter what.
> 
> It looks like requiring a dominator means
> 1. You don't get criss-cross
> 2. You don't get mutual merges.

Here is a worse case:
http://aaronbentley.com/pastegraph.cgi?n=136

In this case, LCA+DOM will pick A, but J would be preferable and F would
be acceptable.  It seems pretty bad that every time you merge, you shove
future merge bases back to the common dominator of PARENT+MERGE

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

iD8DBQFD+ePU0F+nu1YWqI0RAuVQAJ9RWpOoP2kq+8kqwZuRAa9aWl5MgwCdGoHl
btZupL5XP9KmUS6P2NOaPEM=
=X3bD
-----END PGP SIGNATURE-----