Mercurial > hg
view tests/test-mq-strip @ 8820:e8cb1fa0d4a9
test-convert-cvsnt-mergepoints: make it work on OS X.
- don't create file 'cvs' where directory 'CVS' already exists
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Mon, 15 Jun 2009 20:35:19 -0400 |
parents | cb93eee1fbcd |
children | 12e5149cafca |
line wrap: on
line source
#!/bin/sh 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