Mercurial > hg
view tests/test-mq-strip @ 10092:f1bf64abcb1b stable
doc/Makefile: Fix rst2html detection
Displaying the output from the failing call to "which" didn't prevent
make from doing stupid things later. We now only search for "rst2html"
and fallback to "rst2html.py". If neither name is found, make will
eventually abort when we try to use $(RST2HTML).
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Wed, 16 Dec 2009 23:59:50 +0100 |
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