Mercurial > hg-stable
changeset 27177:e76b27a642ca
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.
author | Christian Delahousse <cdelahousse@fb.com> |
---|---|
date | Mon, 30 Nov 2015 11:23:15 -0800 |
parents | 54ace3372f84 |
children | 5ebc4a192550 |
files | tests/test-strip.t |
diffstat | 1 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-strip.t Mon Nov 30 11:23:15 2015 -0800 +++ b/tests/test-strip.t Mon Nov 30 11:23:15 2015 -0800 @@ -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)