##// END OF EJS Templates
test-convert-cvs-detectmerge: add sleep so cvs notices changes
test-convert-cvs-detectmerge: add sleep so cvs notices changes

File last commit:

r11208:2313dc4d default
r12585:385fd0ee default
Show More
test-rebase-issue-noparam-single-rev
51 lines | 832 B | text/plain | TextLexer
/ tests / test-rebase-issue-noparam-single-rev
#!/bin/sh
. $TESTDIR/helpers.sh
echo "[extensions]" >> $HGRCPATH
echo "graphlog=" >> $HGRCPATH
echo "rebase=" >> $HGRCPATH
addcommit () {
echo $1 > $1
hg add $1
hg commit -d "${2} 0" -m $1
}
hg init a
cd a
addcommit "c1" 0
addcommit "c2" 1
addcommit "l1" 2
hg update -C 1
addcommit "r1" 3
addcommit "r2" 4
hg glog --template '{rev}:{desc}\n'
echo
echo '% Rebase with no arguments - single revision in source branch'
hg update -C 2
hg rebase | hidebackup
hg glog --template '{rev}:{desc}\n'
cd ..
rm -rf a
hg init a
cd a
addcommit "c1" 0
addcommit "c2" 1
addcommit "l1" 2
addcommit "l2" 3
hg update -C 1
addcommit "r1" 4
hg glog --template '{rev}:{desc}\n'
echo
echo '% Rebase with no arguments - single revision in target branch'
hg update -C 3
hg rebase 2>&1 | hidebackup
hg glog --template '{rev}:{desc}\n'