equal
deleted
inserted
replaced
|
1 #testcases continuecommand continueflag |
1 Rebasing using a single transaction |
2 Rebasing using a single transaction |
2 |
3 |
3 $ cat >> $HGRCPATH <<EOF |
4 $ cat >> $HGRCPATH <<EOF |
4 > [extensions] |
5 > [extensions] |
5 > rebase= |
6 > rebase= |
13 > |
14 > |
14 > [alias] |
15 > [alias] |
15 > tglog = log -G --template "{rev}: {desc}" |
16 > tglog = log -G --template "{rev}: {desc}" |
16 > EOF |
17 > EOF |
17 |
18 |
|
19 #if continueflag |
|
20 $ cat >> $HGRCPATH <<EOF |
|
21 > [alias] |
|
22 > continue = rebase --continue |
|
23 > EOF |
|
24 #endif |
|
25 |
18 Check that a simple rebase works |
26 Check that a simple rebase works |
19 |
27 |
20 $ hg init simple && cd simple |
28 $ hg init simple && cd simple |
21 $ hg debugdrawdag <<'EOF' |
29 $ hg debugdrawdag <<'EOF' |
22 > Z |
30 > Z |
121 ? conflict.orig |
129 ? conflict.orig |
122 $ echo resolved > conflict |
130 $ echo resolved > conflict |
123 $ hg resolve -m |
131 $ hg resolve -m |
124 (no more unresolved files) |
132 (no more unresolved files) |
125 continue: hg rebase --continue |
133 continue: hg rebase --continue |
126 $ hg rebase --continue |
134 $ hg continue |
127 already rebased 1:112478962961 "B" (B) as 79bc8f4973ce |
135 already rebased 1:112478962961 "B" (B) as 79bc8f4973ce |
128 rebasing 3:c26739dbe603 "C" (C) |
136 rebasing 3:c26739dbe603 "C" (C) |
129 rebasing 5:d24bb333861c "D" (D tip) |
137 rebasing 5:d24bb333861c "D" (D tip) |
130 saved backup bundle to $TESTTMP/collapse-conflict/.hg/strip-backup/112478962961-b5b34645-rebase.hg |
138 saved backup bundle to $TESTTMP/collapse-conflict/.hg/strip-backup/112478962961-b5b34645-rebase.hg |
131 $ hg tglog |
139 $ hg tglog |
175 | | |
183 | | |
176 o | 1: B |
184 o | 1: B |
177 |/ |
185 |/ |
178 o 0: A |
186 o 0: A |
179 |
187 |
180 $ hg rebase --continue |
188 $ hg continue |
181 rebasing 1:112478962961 "B" (B) |
189 rebasing 1:112478962961 "B" (B) |
182 rebasing 3:26805aba1e60 "C" (C) |
190 rebasing 3:26805aba1e60 "C" (C) |
183 rebasing 5:f585351a92f8 "D" (D tip) |
191 rebasing 5:f585351a92f8 "D" (D tip) |
184 saved backup bundle to $TESTTMP/collapse-cancel-editor/.hg/strip-backup/112478962961-cb2a9b47-rebase.hg |
192 saved backup bundle to $TESTTMP/collapse-cancel-editor/.hg/strip-backup/112478962961-cb2a9b47-rebase.hg |
185 $ hg tglog |
193 $ hg tglog |