##// END OF EJS Templates
tests: add hack to avoid problem with graphlog in unified tests
tests: add hack to avoid problem with graphlog in unified tests

File last commit:

r11208:2313dc4d default
r12338:b016fc1c default
Show More
test-rebase-detach
70 lines | 1.4 KiB | text/plain | TextLexer
/ tests / test-rebase-detach
Stefano Tortarolo
rebase: add --detach option to detach intermediate revisions (issue1950)...
r10352 #!/bin/sh
Yuya Nishihara
tests: fix bashism to load helpers.sh...
r11208 . $TESTDIR/helpers.sh
Matt Mackall
rebase: use helpers.sh in tests
r11198
Stefano Tortarolo
rebase: add --detach option to detach intermediate revisions (issue1950)...
r10352 echo "[extensions]" >> $HGRCPATH
echo "graphlog=" >> $HGRCPATH
echo "rebase=" >> $HGRCPATH
BASE=`pwd`
addcommit () {
echo $1 > $1
hg add $1
hg commit -d "${2} 0" -m $1
}
commit () {
hg commit -d "${2} 0" -m $1
}
createrepo () {
cd $BASE
rm -rf a
hg init a
cd a
addcommit "A" 0
addcommit "B" 1
addcommit "C" 2
addcommit "D" 3
hg update -C 0
addcommit "E" 4
}
createrepo > /dev/null 2>&1
hg glog --template '{rev}: {desc}\n'
echo '% Rebasing D onto E detaching from C'
Matt Mackall
rebase: use helpers.sh in tests
r11198 hg rebase --detach -s 3 -d 4 | hidebackup
Stefano Tortarolo
rebase: add --detach option to detach intermediate revisions (issue1950)...
r10352 hg glog --template '{rev}: {desc}\n'
echo "Expected A, D, E"
hg manifest
echo
createrepo > /dev/null 2>&1
hg glog --template '{rev}: {desc}\n'
echo '% Rebasing C onto E detaching from B'
Matt Mackall
rebase: use helpers.sh in tests
r11198 hg rebase --detach -s 2 -d 4 | hidebackup
Stefano Tortarolo
rebase: add --detach option to detach intermediate revisions (issue1950)...
r10352 hg glog --template '{rev}: {desc}\n'
echo "Expected A, C, D, E"
hg manifest
echo
createrepo > /dev/null 2>&1
hg glog --template '{rev}: {desc}\n'
echo '% Rebasing B onto E using detach (same as not using it)'
Matt Mackall
rebase: use helpers.sh in tests
r11198 hg rebase --detach -s 1 -d 4 | hidebackup
Stefano Tortarolo
rebase: add --detach option to detach intermediate revisions (issue1950)...
r10352 hg glog --template '{rev}: {desc}\n'
echo "Expected A, B, C, D, E"
hg manifest
echo
createrepo > /dev/null 2>&1
hg glog --template '{rev}: {desc}\n'
echo '% Rebasing C onto E detaching from B and collapsing'
Matt Mackall
rebase: use helpers.sh in tests
r11198 hg rebase --detach --collapse -s 2 -d 4 | hidebackup
Stefano Tortarolo
rebase: add --detach option to detach intermediate revisions (issue1950)...
r10352 hg glog --template '{rev}: {desc}\n'
echo "Expected A, C, D, E"
hg manifest
exit 0