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

Oben Sonne obensonne at googlemail.com
Fri Mar 25 13:19:36 CDT 2011


On Fri, Mar 25, 2011 at 5:42 PM, Martin Geisler <mg at aragost.com> wrote:
> 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?

In my understanding I don't consider bookmarks to be part of the
history, but overlaid markers for lines of development in the history.


More information about the Mercurial-devel mailing list