[PATCH 7 of 7] strip: strip obsmarkers exclusive to the stripped changeset

Mathias De Maré mathias.de_mare at nokia.com
Thu Nov 2 08:49:43 UTC 2017


On 01-06-17 15:39, Pierre-Yves David wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david at octobus.net>
> # Date 1495289999 -7200
> #      Sat May 20 16:19:59 2017 +0200
> # Node ID fb16a4d85cf46afbc12bb61f8d22784cef31d1dc
> # Parent  2c44bd45fdeeb3a8bf1762af4a81af3914fadc29
> # EXP-Topic obsstrip
> # Available At https://www.mercurial-scm.org/repo/users/marmoute/mercurial/
> #              hg pull https://www.mercurial-scm.org/repo/users/marmoute/mercurial/ -r fb16a4d85cf4
> strip: strip obsmarkers exclusive to the stripped changeset
>
> This is it, `hg strip --rev X` will now also remove obsolescence markers
> exclusive to X. Since a previous changeset, the obsmarkers has been backed up
> in the strip backup bundle, so it is possible to restore them.
>
> Note: stripping obsmarkers means the precursors of the stripped changeset might no
> longer be obsolete after the strip.
>
> Stripping changeset without obsmarkers can be useful when building test case. So
> It is possible to disable the stripping of obsmarkers using the
> 'devel.strip-obsmarkers' config option.
>
> Test change have been carefully validated.

We recently upgrade to 4.3.3, and received some user complaints about 
this change.
They used 'hg strip' to remove in-development changesets they no longer 
need. This could be solved by having 'hg prune' in Mercurial itself (we 
don't have evolve enabled for our users). Unless there is already an 
alternative present?

Greetings,
Mathias


More information about the Mercurial-devel mailing list