Multiple Bookmark on merged changeset are converged

Shridhar Daithankar ghodechhap at ghodechhap.net
Tue Sep 8 00:06:26 CDT 2009


Hello,

I was toying with bookmark and see how it fits with branching/tagging model 
that I am comfortable with.

It is almost perfect(not syncing between repos aside) except how bookmarks are 
handled at merges.

If there is a head and a stable branch in tree, for new releases, fixes from 
stable are merged with head but the stable branch may continue seeing the 
update even after a new release.

However the merge brings both the bookmarks to the merged changeset and any 
update to this merged changeset moves both of them forward, as if the stable 
branch ceases to exist after the merge.

A log of illustration is available at http://ghodechhap.net/bookmark.log.

I think in case of merges, only bookmark on current changeset should be 
retained and bookmark of head being merged should not be touched. This way the 
stable branch can continue further without problems.

http://lazymalloc.blogspot.com/2009/03/uses-of-mercurials-bookmarks-
extension.html claims that it works.(I know its unrelated to the project but 
that post prompted me to verify this). Specifically

--------------------
You will notice that the bookmark moves along with your commit. With the 
extension set to track the "current" bookmark, only the one currently set will 
move forward. This means that you can set two bookmarks to the same revision, 
and as long as you update appropriately only one will move forward. This is 
different from how the bookmarks extension operates by default, which entails 
all bookmarks moving forward when a commit is done on their parent.
--------------------

So this used to work and is a regression?

Also any idea when the bookmarks will be integrated with push/pull? :) That 
would really be awesome.

-- 
 Shridhar


More information about the Mercurial mailing list