[PATCH STABLE v2] strip: move bookmarks to nearest ancestor rather than '.'

Augie Fackler raf at durin42.com
Fri Jul 27 09:38:11 CDT 2012


On Jul 27, 2012, at 9:34 AM, Adrian Buehlmann wrote:

> On 2012-07-27 00:06, Augie Fackler wrote:
>> # HG changeset patch
>> # User Augie Fackler <raf at durin42.com>
>> # Date 1343339870 18000
>> # Branch stable
>> # Node ID 858674ebe23c231d0648c37cfb8a1b69d943cef7
>> # Parent  98166640b356b4c44bc87ce9137c7647eb728332
>> strip: move bookmarks to nearest ancestor rather than '.'
>> 
>> The current behavior of strip has always struck me as a bug when
>> stripping a bookmarked revision the ancestor of a bookmarked
>> revision.
> 
> /me scratches head. I somehow fail to parse this sentence.

If you've got this graph:

0 - 1 - 2
       \--3

and 3 is checked out, 2 is bookmarked with "broken", and you do "hg strip 2", the bookmark will move to 3, not 1. That's always struck me as a bug.

Agreed, the sentence is unclear as written. Happy to resend with something clearer if someone can work out an actually-coherent statement.

> 
>> This change makes bookmarks move to the tipmost ancestor of
>> the stripped set rather than the currently-checked-out revision, which
>> is what I always expected should happen.



More information about the Mercurial-devel mailing list