equal
deleted
inserted
replaced
|
1 #testcases continuecommand continueflag |
1 This emulates the effects of an hg pull --rebase in which the remote repo |
2 This emulates the effects of an hg pull --rebase in which the remote repo |
2 already has one local mq patch |
3 already has one local mq patch |
3 |
4 |
4 $ cat >> $HGRCPATH <<EOF |
5 $ cat >> $HGRCPATH <<EOF |
5 > [extensions] |
6 > [extensions] |
11 > |
12 > |
12 > [alias] |
13 > [alias] |
13 > tglog = log -G --template "{rev}: {node|short} '{desc}' tags: {tags}\n" |
14 > tglog = log -G --template "{rev}: {node|short} '{desc}' tags: {tags}\n" |
14 > EOF |
15 > EOF |
15 |
16 |
|
17 #if continueflag |
|
18 $ cat >> $HGRCPATH <<EOF |
|
19 > [alias] |
|
20 > continue = rebase --continue |
|
21 > EOF |
|
22 #endif |
16 |
23 |
17 $ hg init a |
24 $ hg init a |
18 $ cd a |
25 $ cd a |
19 $ hg qinit -c |
26 $ hg qinit -c |
20 |
27 |
153 |
160 |
154 $ HGMERGE=internal:local hg resolve --all |
161 $ HGMERGE=internal:local hg resolve --all |
155 (no more unresolved files) |
162 (no more unresolved files) |
156 continue: hg rebase --continue |
163 continue: hg rebase --continue |
157 |
164 |
158 $ hg rebase --continue |
165 $ hg continue |
159 already rebased 1:b4bffa6e4776 "r1" (qbase r1) as 057f55ff8f44 |
166 already rebased 1:b4bffa6e4776 "r1" (qbase r1) as 057f55ff8f44 |
160 already rebased 2:c0fd129beb01 "r2" (r2) as 1660ab13ce9a |
167 already rebased 2:c0fd129beb01 "r2" (r2) as 1660ab13ce9a |
161 already rebased 3:6ff5b8feed8e "r3" (r3) as 1660ab13ce9a |
168 already rebased 3:6ff5b8feed8e "r3" (r3) as 1660ab13ce9a |
162 rebasing 4:094320fec554 "r4" (r4) |
169 rebasing 4:094320fec554 "r4" (r4) |
163 note: not rebasing 4:094320fec554 "r4" (r4), its destination already has all its changes |
170 note: not rebasing 4:094320fec554 "r4" (r4), its destination already has all its changes |