equal
deleted
inserted
replaced
1 #!/bin/sh |
1 #!/bin/sh |
|
2 |
|
3 source $TESTDIR/helpers.sh |
2 |
4 |
3 echo "[extensions]" >> $HGRCPATH |
5 echo "[extensions]" >> $HGRCPATH |
4 echo "graphlog=" >> $HGRCPATH |
6 echo "graphlog=" >> $HGRCPATH |
5 echo "rebase=" >> $HGRCPATH |
7 echo "rebase=" >> $HGRCPATH |
6 |
|
7 cleanoutput () { |
|
8 sed -e 's/\(Rebase status stored to\).*/\1/' \ |
|
9 -e 's/\(Rebase status restored from\).*/\1/' \ |
|
10 -e 's/\(saving bundle to \).*/\1/' |
|
11 } |
|
12 |
8 |
13 hg init a |
9 hg init a |
14 cd a |
10 cd a |
15 echo 'c1' >common |
11 echo 'c1' >common |
16 hg add common |
12 hg add common |
51 |
47 |
52 echo |
48 echo |
53 echo '% Conclude rebase' |
49 echo '% Conclude rebase' |
54 echo 'resolved merge' >common |
50 echo 'resolved merge' >common |
55 hg resolve -m common |
51 hg resolve -m common |
56 hg rebase --continue 2>&1 | cleanoutput |
52 hg rebase --continue | cleanrebase |
57 |
53 |
58 hg glog --template '{rev}: {desc}\n' |
54 hg glog --template '{rev}: {desc}\n' |
59 |
55 |
60 echo |
56 echo |
61 echo '% Check correctness' |
57 echo '% Check correctness' |