test-rebase-abort
44 lines
| 811 B
| text/plain
|
TextLexer
/ tests / test-rebase-abort
Stefano Tortarolo
|
r6906 | #!/bin/sh | ||
echo "[extensions]" >> $HGRCPATH | ||||
echo "graphlog=" >> $HGRCPATH | ||||
echo "rebase=" >> $HGRCPATH | ||||
Brendan Cully
|
r6910 | cleanoutput () { | ||
Stefano Tortarolo
|
r6906 | sed -e 's/\(Rebase status stored to\).*/\1/' \ | ||
-e 's/\(Rebase status restored from\).*/\1/' \ | ||||
-e 's/\(saving bundle to \).*/\1/' | ||||
} | ||||
hg init a | ||||
cd a | ||||
echo 'c1' >common | ||||
hg add common | ||||
Martin Geisler
|
r8168 | hg commit -d '0 0' -m "C1" | ||
Stefano Tortarolo
|
r6906 | |||
echo 'c2' >>common | ||||
Martin Geisler
|
r8168 | hg commit -d '1 0' -m "C2" | ||
Stefano Tortarolo
|
r6906 | |||
echo 'c3' >>common | ||||
Martin Geisler
|
r8168 | hg commit -d '2 0' -m "C3" | ||
Stefano Tortarolo
|
r6906 | |||
hg update -C 1 | ||||
echo 'l1' >>extra | ||||
hg add extra | ||||
Martin Geisler
|
r8168 | hg commit -d '3 0' -m "L1" | ||
Stefano Tortarolo
|
r6906 | |||
sed -e 's/c2/l2/' common > common.new | ||||
mv common.new common | ||||
Martin Geisler
|
r8168 | hg commit -d '4 0' -m "L2" | ||
Stefano Tortarolo
|
r6906 | |||
hg glog --template '{rev}: {desc}\n' | ||||
echo | ||||
echo '% Conflicting rebase' | ||||
hg rebase -s 3 -d 2 2>&1 | cleanoutput | ||||
echo | ||||
echo '% Abort' | ||||
hg rebase --abort 2>&1 | cleanoutput | ||||
hg glog --template '{rev}: {desc}\n' | ||||