##// 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:

r6906:808f03f6 default
r8081:6c3b8132 default
Show More
test-rebase-mq-skip
44 lines | 814 B | text/plain | TextLexer
#!/bin/sh
# This emulates the effects of an hg pull --rebase in which the remote repo
# already has one local mq patch
echo "[extensions]" >> $HGRCPATH
echo "graphlog=" >> $HGRCPATH
echo "rebase=" >> $HGRCPATH
echo "mq=" >> $HGRCPATH
hg init a
cd a
hg qinit -c # This must work even with a managed mq queue
echo 'c1' > c1
hg add c1
hg commit -d '0 0' -u test -m "C1"
echo 'r1' > r1
hg add r1
hg commit -d '1 0' -u test -m "R1"
hg up 0
hg qnew p0.patch
echo 'p0' > p0
hg add p0
hg qref -m 'P0'
hg qnew p1.patch
echo 'p1' > p1
hg add p1
hg qref -m 'P1'
hg export qtip > p1.patch
echo
echo '% "Mainstream" import p1.patch'
hg up -C 1
hg import p1.patch
rm p1.patch
echo
echo '% Rebase'
hg up -C qtip
hg rebase 2>&1 | sed -e 's/\(saving bundle to \).*/\1/'
hg glog --template '{rev} {desc} tags: {tags}\n'