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

cdelahousse at fb.com cdelahousse at fb.com
Tue Nov 17 16:54:20 CST 2015


# HG changeset patch
# User Christian Delahousse <cdelahousse at fb.com>
# Date 1447796145 28800
#      Tue Nov 17 13:35:45 2015 -0800
# Node ID eeef27919dc845f20f6abc477f50adbab2cb9760
# Parent  84176ccac91ec4b0c90e0ff6ee3b06e2708ef70a
strip: add a --keep test related to removing files from dirstate

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)


More information about the Mercurial-devel mailing list