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

[Pierre-Yves David]

On Thu, Nov 01, 2012 at 01:51:20PM -0500, Matt Mackall wrote:
> 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.

I think that using "hg update" is very suitable to such situation.

    "I'm lagging behind, let's update to lastest version"

Having "hg merge" handle such situation for consistency is probably a good idea
but as a secondary objective.

> 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.

We probably need this kind of concept to handle bookmark during rebase (when
conflict happen), histedit or any other multi step operation.

-- 
Pierre-Yves David

http://www.logilab.fr/

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20121109/5cb9a031/attachment.pgp>