[PATCH v3 STABLE] bookmarks: correctly update current bookmarks on rebase (issue2277)

David Schleimer dschleimer at fb.com
Fri Jun 22 13:32:54 CDT 2012


I thought it was covered ☹.  I meant the test my last patch added to cover the working directory parent being maintained, which is why I dropped it.  I’ll send another patch with a test that covers updating the current bookmark.

--David

From: Kevin Bullock [mailto:kbullock+mercurial at ringworld.org]
Sent: Thursday, June 21, 2012 8:26 PM
To: David Schleimer
Cc: mpm at selenic.com; mercurial-devel at selenic.com
Subject: Re: [PATCH v3 STABLE] bookmarks: correctly update current bookmarks on rebase (issue2277)

On 21 Jun 2012, at 6:42 PM, David Schleimer wrote:


# HG changeset patch
# User David Schleimer <dschleimer at fb.com<mailto:dschleimer at fb.com>>
# Date 1340321402 25200
# Branch stable
# Node ID bb4baf14a62436a3a6fef179953295e1de867606
# Parent  01eb882489371c2f2f4de3500497cade12df2883
bookmarks: correctly update current bookmarks on rebase (issue2277)

When you rebased with a currently active bookmark, that bookmark would
always point at the new tip, regardless of what revision it pointed at
before the rebase.

All bookmarks will now point at the equivalent post-rebase commit.
However, the currently active bookmark will cease to be active unless
it points at the new tip post-rebase.  Rebase will always leave the
new tip as the working copy parent, which is incompatible with having
an active bookmark that points at some other revision.  The common
case should be that the active bookmark will point at the new tip
post-rebase.

I note that now we don't appear to have a test case that covers behavior described in this paragraph. I'm +1 on the patch though. (The test can be added in a follow-up if deemed necessary.)

pacem in terris / мир / शान्ति / ‎‫سَلاَم / 平和
Kevin R. Bullock

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20120622/a7a91f42/attachment.html>


More information about the Mercurial-devel mailing list