##// END OF EJS Templates
diff: fix obscure off-by-one error in diff -p
diff: fix obscure off-by-one error in diff -p

File last commit:

r6910:93609576 default
r7436:07faba78 default
Show More
test-rebase-pull
50 lines | 785 B | text/plain | TextLexer
Stefano Tortarolo
Add rebase extension
r6906 #!/bin/sh
echo "[extensions]" >> $HGRCPATH
echo "graphlog=" >> $HGRCPATH
echo "rebase=" >> $HGRCPATH
BASE=`pwd`
Brendan Cully
Debashify rebase tests
r6910 addcommit () {
Stefano Tortarolo
Add rebase extension
r6906 echo $1 > $1
hg add $1
hg commit -d "${2} 0" -u test -m $1
}
Brendan Cully
Debashify rebase tests
r6910
commit () {
Stefano Tortarolo
Add rebase extension
r6906 hg commit -d "${2} 0" -u test -m $1
}
cd $BASE
rm -rf a
hg init a
cd a
addcommit "C1" 0
addcommit "C2" 1
cd ..
hg clone a b
cd b
addcommit "L1" 2
cd ../a
addcommit "R1" 3
cd ../b
echo
echo "% Now b has one revision to be pulled from a"
hg pull --rebase 2>&1 | sed -e 's/\(saving bundle to \).*/\1/' \
-e 's/\(pulling from \).*/\1/'
hg glog --template '{rev}:{desc}\n'
echo
echo "% Re-run pull --rebase"
hg pull --rebase 2>&1 | sed 's/\(pulling from \).*/\1/'
echo
echo "% Invoke pull --rebase with --update"
hg pull --rebase --update
exit 0