##// END OF EJS Templates
issue1577: fix broken test by assuming less about CVS output....
issue1577: fix broken test by assuming less about CVS output. Specifically, output of "cvs ci" varies unpredictably across CVS versions, so any test that includes the output of "cvs ci" is doomed to fail some of the time. This fixes that by discarding the output of "cvs ci".

File last commit:

r6910:93609576 default
r8081:6c3b8132 default
Show More
test-rebase-abort
44 lines | 851 B | text/plain | TextLexer
#!/bin/sh
echo "[extensions]" >> $HGRCPATH
echo "graphlog=" >> $HGRCPATH
echo "rebase=" >> $HGRCPATH
cleanoutput () {
sed -e 's/\(Rebase status stored to\).*/\1/' \
-e 's/\(Rebase status restored from\).*/\1/' \
-e 's/\(saving bundle to \).*/\1/'
}
hg init a
cd a
echo 'c1' >common
hg add common
hg commit -d '0 0' -u test -m "C1"
echo 'c2' >>common
hg commit -d '1 0' -u test -m "C2"
echo 'c3' >>common
hg commit -d '2 0' -u test -m "C3"
hg update -C 1
echo 'l1' >>extra
hg add extra
hg commit -d '3 0' -u test -m "L1"
sed -e 's/c2/l2/' common > common.new
mv common.new common
hg commit -d '4 0' -u test -m "L2"
hg glog --template '{rev}: {desc}\n'
echo
echo '% Conflicting rebase'
hg rebase -s 3 -d 2 2>&1 | cleanoutput
echo
echo '% Abort'
hg rebase --abort 2>&1 | cleanoutput
hg glog --template '{rev}: {desc}\n'