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

[John A Meinel]

Aaron Bentley wrote:
> 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

And one other small thing. When we have a GUI, it might make sense to
have an advanced option while merging to display the revision graph, and
allow the user to manually select the merge base. Because ultimately a
human who understands what the different revisions are, can probably
pick the best base.

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060220/a0b221f9/attachment.pgp