[PATCH] bookmarks: active bookmark diverges if a pull would move it (issue3682)

Matt Mackall mpm at selenic.com
Thu Nov 1 13:51:20 CDT 2012


On Wed, 2012-10-24 at 16:04 -0500, Kevin Bullock wrote:
> # HG changeset patch
> # User Kevin Bullock <kbullock at ringworld.org>
> # Date 1351112598 18000
> # Branch stable
> # Node ID 188c42046dfd1441455c63cdde13c0ef757d17a5
> # Parent  acd4577a568d22d3e58bab28600a5ce0a3f87ce1
> bookmarks: active bookmark diverges if a pull would move it (issue3682)

This issue is getting deferred to post-2.4 since there seem to be some
interesting repercussions to this choice. It needs additional support in
update and probably merge and that effectively reinvents Git's confusing
fast-forward merge which isn't somewhere I'm eager to go.

An alternate proposal is to change the notion of 'active' bookmarks so
that a bookmark can stay active even if it is advanced by pull. Then
update can notice that the active bookmark advanced relative to '.' and
move to it.

-- 
Mathematics is the supreme nostalgia of our time.




More information about the Mercurial-devel mailing list