test-rebase-check-restore
70 lines
| 1.3 KiB
| text/plain
|
TextLexer
/ tests / test-rebase-check-restore
|
r7952 | #!/bin/sh | ||
|
r11198 | source $TESTDIR/helpers.sh | ||
|
r7952 | echo "[extensions]" >> $HGRCPATH | ||
echo "graphlog=" >> $HGRCPATH | ||||
echo "rebase=" >> $HGRCPATH | ||||
BASE=`pwd` | ||||
addcommit () { | ||||
echo $1 > $1 | ||||
hg add $1 | ||||
|
r8168 | hg commit -d "${2} 0" -m $1 | ||
|
r7952 | } | ||
commit () { | ||||
|
r8168 | hg commit -d "${2} 0" -m $1 | ||
|
r7952 | } | ||
createrepo () { | ||||
cd $BASE | ||||
rm -rf a | ||||
hg init a | ||||
cd a | ||||
addcommit "A" 0 | ||||
addcommit "B" 1 | ||||
echo "C" >> A | ||||
commit "C" 2 | ||||
hg update -C 0 | ||||
echo "D" >> A | ||||
commit "D" 3 | ||||
addcommit "E" 4 | ||||
hg update -C 0 | ||||
hg branch 'notdefault' | ||||
echo "F" >> A | ||||
commit "F" 5 | ||||
} | ||||
echo | ||||
echo "% - Rebasing B onto E - check keep" | ||||
createrepo > /dev/null 2>&1 | ||||
hg glog --template '{rev}:{desc}:{branches}\n' | ||||
|
r11198 | hg rebase -s 1 -d 4 --keep | hidebackup | ||
|
r7952 | |||
echo | ||||
echo "% - Solve the conflict and go on" | ||||
echo 'conflict solved' > A | ||||
rm A.orig | ||||
hg resolve -m A | ||||
|
r11198 | hg rebase --continue | hidebackup | ||
|
r7952 | hg glog --template '{rev}:{desc}:{branches}\n' | ||
echo | ||||
echo "% - Rebase F onto E - check keepbranches" | ||||
createrepo > /dev/null 2>&1 | ||||
hg glog --template '{rev}:{desc}:{branches}\n' | ||||
|
r11198 | hg rebase -s 5 -d 4 --keepbranches | hidebackup | ||
|
r7952 | |||
echo | ||||
echo "% - Solve the conflict and go on" | ||||
echo 'conflict solved' > A | ||||
rm A.orig | ||||
hg resolve -m A | ||||
|
r11198 | hg rebase --continue 2>&1 | hidebackup | ||
|
r7952 | hg glog --template '{rev}:{desc}:{branches}\n' | ||
exit 0 | ||||