view tests/test-bookmarks-rebase @ 8819:e93ab347c814

test-convert-cvsnt-mergepoints: ignore differences between CVS 1.11 and 1.12.

- factor out cvsci function (similar to other test-convert-cvs* scripts)
- add filterpath function (also similar to other scripts)
- generally munge the output of CVS
- add lots of output to make it easier to follow when things go wrong

This doesn't make the test pass reliably under CVS 1.11; it just makes
it behave the same as under CVS 1.12, i.e. sometimes it passes and
sometimes it fails.  Failure is more frequent with faster hardware.

#!/bin/sh

echo "[extensions]" >> $HGRCPATH
echo "rebase=" >> $HGRCPATH
echo "bookmarks=" >> $HGRCPATH

cleanoutput () {
    sed -e 's/\(Rebase status stored to\).*/\1/'  \
        -e 's/\(Rebase status restored from\).*/\1/' \
        -e 's/\(saving bundle to \).*/\1/'
}

echo % initialize repository
hg init

echo 'a' > a
hg ci -A -m "0"

echo 'b' > b
hg ci -A -m "1"

hg up 0
echo 'c' > c
hg ci -A -m "2"

echo 'd' > d
hg ci -A -m "3"

hg bookmark -r 1 one
hg bookmark -r 3 two

echo % bookmark list
hg bookmark

echo % rebase
hg rebase -s two -d one 2>&1 | cleanoutput

hg log