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

Pierre-Yves David pierre-yves.david at ens-lyon.org
Fri Oct 26 19:10:54 CDT 2012


On 24 oct. 2012, at 23:04, 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)
> 
> Before this change, a pull could move the active bookmark (even
> backwards). This resulted in the bookmark no longer being active (but
> still being listed in .hg/bookmarks.current -- also see issue3683).
> 
> After this change, if a pull would move the active bookmark, the
> divergent bookmarks machinery is invoked, leaving the active bookmark
> where it was.

Beware, there is currently no handy way to resolve such divergence!

Since 2.3, usual way to resolve divergence is to use "hg merge". However merge will refuse to merge with a descendants (and the case above create divergence with a descendants).

I think that "hg merge" and/or "hg update" should be altered reduce divergent marker on topologically unmergeable changesets.

-- 
Pierre-Yves


More information about the Mercurial-devel mailing list