[PATCH 4 of 4 V3] strip: add a --keep test related to removing files from dirstate

Augie Fackler raf at durin42.com
Wed Dec 2 09:28:12 CST 2015


On Tue, Dec 01, 2015 at 11:38:28AM -0800, cdelahousse at fb.com wrote:
> # HG changeset patch
> # User Christian Delahousse <cdelahousse at fb.com>
> # Date 1448911395 28800
> #      Mon Nov 30 11:23:15 2015 -0800
> # Node ID 19e4c306faa890d082c3059e249d07f609025f6a
> # Parent  ed45ba0f6b36e931b1a0dcbacc9fa7e5c60c2c05
> strip: add a --keep test related to removing files from dirstate

queued these, thanks

>
> When strip builds the list of changedfiles to pass into dirstate.rebuild, it adds
> files blindly, including those that have been removed. This tests ensures that
> rebuild can handle this case.
>
> diff --git a/tests/test-strip.t b/tests/test-strip.t
> --- a/tests/test-strip.t
> +++ b/tests/test-strip.t
> @@ -552,12 +552,19 @@
>    $ echo b > b
>    $ echo d > d
>    $ hg strip --keep tip
> -  saved backup bundle to $TESTTMP/test/.hg/strip-backup/57e364c8a475-4cfed93c-backup.hg (glob)
> +  saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob)
>    $ hg status
>    M b
>    ! bar
>    ? c
>    ? d
> +
> +... after updating the dirstate
> +  $ hg add c
> +  $ hg commit -mc
> +  $ hg rm c
> +  $ hg commit -mc
> +  $ hg strip --keep '.^' -q
>    $ cd ..
>
>  stripping many nodes on a complex graph (issue3299)
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> https://selenic.com/mailman/listinfo/mercurial-devel


More information about the Mercurial-devel mailing list