# HG changeset patch # User Christian Delahousse # Date 2015-11-30 19:23:15 # Node ID e76b27a642ca40b61c6dc20d8213a0e5c74842cc # Parent 54ace3372f84988786ea4f6e7613fec14bed0660 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 @@ Strip adds, removes, modifies with --kee $ 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)