[PATCH 1 of 2] bookmarks: When merging, don't advance bookmark for the other revision

David Shilvock davels at telus.net
Sun Nov 9 15:40:30 CST 2008


> Hi David,
>
> thanks for the patch but frankly I think the current behaviour is fine.
> We want to update bookmarks that are on a parent. I want to update both 
> bookmarks if I merge a bookmark into another. Maybe other people have 
> different opinions on that and if more user don't like the current 
> behaviour we might change it, but at the moment I think the current one 
> is fine.
>
> David
>
> David Shilvock schrieb:
>> # HG changeset patch
>> # User David Shilvock <davels at telus.net>
>> # Date 1226046586 28800
>> # Node ID 8920535663e440f478dadd5b29a754966844786d
>> # Parent  eae1767cc6a8002a1d75b3af40e11782efc288ba
>> bookmarks: When merging, don't advance bookmark for the other revision
>> 
>> When merging, a bookmark on the current head should be advanced to the merge
>> commit.  A bookmark on the 'other' revision should be left alone so further
>> commits can be made to that branch.
>> 
>> diff --git a/hgext/bookmarks.py b/hgext/bookmarks.py
[...]

Not a problem.  I learned a lot about the Mercurial internals playing with
this.

As an aside, is there a preferred method for proposing these types of
functionality changes?

-- 
DS


More information about the Mercurial-devel mailing list