Discussion about merging

[David Allouche]

On Fri, 2005-06-03 at 15:58 -0400, Aaron Bentley wrote:
> That's a mesh-merge problem.  And as you may have noticed, mesh-merge
> sometimes becomes mess-merge.
> 
> But the technique, AIUI it is:
> 1. Find the set intersection of all the merges of both trees.
> 2. Find the non-cherry-pick merge that has merged everything else in the
> ~ set intersection.

For some time I have been thinking that the technique was:

     1. Find the set intersection of all merges (and ancestors) of both
        trees.
     2. Find the revision which is closest[1] to the intersection and
        whose set of merges (and ancestors) is a subset of this
        intersection.
     3. Do not care about whether it's a cherrypick or not.

[1] closest: the magic is in defining the patchset distance

And I have found no explanation as to why cherrypicks _have_ to be
handled specially.

I understand that Codeville merging makes that irrelevant, but it annoys
me a bit that this question stands unanswered.

-- 
                                                            -- ddaa
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050604/f8f9a417/attachment.pgp