Mercurial > hg
diff tests/test-mq-strip @ 6635:d90d83ebea9e
mq: don't update the working copy on strip if parents aren't stripped
* * *
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Tue, 03 Jun 2008 12:10:14 +0200 |
parents | |
children | cb93eee1fbcd |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-mq-strip Tue Jun 03 12:10:14 2008 +0200 @@ -0,0 +1,51 @@ +echo "[extensions]" >> $HGRCPATH +echo "mq=" >> $HGRCPATH + +teststrip() { + hg up -C $1 + echo % before update $1, strip $2 + hg parents + hg strip $2 2>&1 | sed 's/\(saving bundle to \).*/\1/' + echo % after update $1, strip $2 + hg parents + hg unbundle -q .hg/strip-backup/* + rm .hg/strip-backup/* +} + +hg init test +cd test + +echo foo > bar +hg ci -Ama + +echo more >> bar +hg ci -Amb + +echo blah >> bar +hg ci -Amc + +hg up 1 +echo blah >> bar +hg ci -Amd + +echo final >> bar +hg ci -Ame + +hg log + +teststrip 4 4 +teststrip 4 3 +teststrip 1 4 +teststrip 4 2 +teststrip 4 1 +teststrip null 4 + +hg log + +hg up -C 2 +hg merge 4 +echo % before strip of merge parent +hg parents +hg strip 4 2>&1 | sed 's/\(saving bundle to \).*/\1/' +echo % after strip of merge parent +hg parents