[PATCH] bookmarks: do not move merged bookmarks (issue1877)

Martin Geisler mg at aragost.com
Fri Mar 25 11:42:43 CDT 2011


Matt Mackall <mpm at selenic.com> writes:

> On Fri, 2011-03-25 at 16:32 +0100, Martin Geisler wrote:
>
>> Hmm... I'm not sure how you can turn my graphs upside-down.
>
> *facepalm*

Right back at you... :)

> You can't be serious. 
>
>     ... o --- o --- M
>           \       /
>            o --- o
>                  X
>
> becomes
>
>                  X
>            o --- o
>           /       \
>     ... o --- o --- M
>
>
> Now, given that these graphs are identical, except that X now comes in
> from the top rather than the bottom in M (ie p1 and p2 are swapped),
> explain why the behavior of the merge at M should be different in
> these mirror images. In other words, why should symmetry be broken?

It should be broken because of the use case I explained in the part you
deleted? But it seems that I'm not getting through, so I'll let the
bookmark guys explain it instead...

-- 
Martin Geisler

aragost Trifork
Professional Mercurial support
http://aragost.com/en/services/mercurial/blog/


More information about the Mercurial-devel mailing list