test-rebase-interruptions
83 lines
| 1.4 KiB
| text/plain
|
TextLexer
/ tests / test-rebase-interruptions
|
r6906 | #!/bin/sh | ||
|
r11208 | . $TESTDIR/helpers.sh | ||
|
r6906 | echo "[extensions]" >> $HGRCPATH | ||
echo "graphlog=" >> $HGRCPATH | ||||
echo "rebase=" >> $HGRCPATH | ||||
BASE=`pwd` | ||||
|
r6910 | addcommit () { | ||
|
r6906 | echo $1 > $1 | ||
hg add $1 | ||||
|
r8168 | hg commit -d "${2} 0" -m $1 | ||
|
r6906 | } | ||
|
r6910 | |||
commit () { | ||||
|
r8168 | hg commit -d "${2} 0" -m $1 | ||
|
r6906 | } | ||
|
r6910 | createrepo () { | ||
|
r6906 | 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 | ||||
} | ||||
echo "% Changes during an interruption - continue" | ||||
createrepo > /dev/null 2>&1 | ||||
hg glog --template '{rev}: {desc}\n' | ||||
echo | ||||
echo "% - Rebasing B onto E" | ||||
|
r11198 | hg rebase -s 1 -d 4 | hidebackup | ||
|
r6906 | |||
echo | ||||
echo "% - Force a commit on C during the interruption" | ||||
hg update -C 2 | ||||
addcommit "Extra" 5 | ||||
hg glog --template '{rev}: {desc}\n' | ||||
echo | ||||
echo "% - Resume the rebasing" | ||||
hg rebase --continue | ||||
echo | ||||
echo "% - Solve the conflict and go on" | ||||
echo 'conflict solved' > A | ||||
rm A.orig | ||||
hg resolve -m A | ||||
hg rebase --continue | ||||
hg glog --template '{rev}: {desc}\n' | ||||
echo | ||||
echo | ||||
echo "% Changes during an interruption - abort" | ||||
createrepo > /dev/null 2>&1 | ||||
hg glog --template '{rev}: {desc}\n' | ||||
echo | ||||
echo "% Rebasing B onto E" | ||||
|
r11198 | hg rebase -s 1 -d 4 | hidebackup | ||
|
r6906 | |||
echo | ||||
echo "% Force a commit on B' during the interruption" | ||||
hg update -C 5 | ||||
addcommit "Extra" 6 | ||||
hg glog --template '{rev}: {desc}\n' | ||||
echo | ||||
echo "% Abort the rebasing" | ||||
hg rebase --abort | ||||
hg glog --template '{rev}: {desc}\n' | ||||
exit 0 | ||||