equal
deleted
inserted
replaced
1 #testcases abortcommand abortflag |
1 #testcases abortcommand abortflag |
|
2 #testcases continuecommand continueflag |
2 |
3 |
3 $ cat >> $HGRCPATH <<EOF |
4 $ cat >> $HGRCPATH <<EOF |
4 > [extensions] |
5 > [extensions] |
5 > rebase= |
6 > rebase= |
6 > |
7 > |
13 |
14 |
14 #if abortflag |
15 #if abortflag |
15 $ cat >> $HGRCPATH <<EOF |
16 $ cat >> $HGRCPATH <<EOF |
16 > [alias] |
17 > [alias] |
17 > abort = rebase --abort |
18 > abort = rebase --abort |
|
19 > EOF |
|
20 #endif |
|
21 |
|
22 #if continueflag |
|
23 $ cat >> $HGRCPATH <<EOF |
|
24 > [alias] |
|
25 > continue = rebase --continue |
18 > EOF |
26 > EOF |
19 #endif |
27 #endif |
20 |
28 |
21 $ hg init a |
29 $ hg init a |
22 $ cd a |
30 $ cd a |
160 $ mv .hg/rebasestate .hg/rebasestate.back |
168 $ mv .hg/rebasestate .hg/rebasestate.back |
161 $ hg update --quiet --clean 2 |
169 $ hg update --quiet --clean 2 |
162 $ hg --config extensions.mq= strip --quiet "destination()" |
170 $ hg --config extensions.mq= strip --quiet "destination()" |
163 $ mv .hg/rebasestate.back .hg/rebasestate |
171 $ mv .hg/rebasestate.back .hg/rebasestate |
164 |
172 |
165 $ hg rebase --continue |
173 $ hg continue |
166 abort: cannot continue inconsistent rebase |
174 abort: cannot continue inconsistent rebase |
167 (use "hg rebase --abort" to clear broken state) |
175 (use "hg rebase --abort" to clear broken state) |
168 [255] |
176 [255] |
169 $ hg summary | grep '^rebase: ' |
177 $ hg summary | grep '^rebase: ' |
170 rebase: (use "hg rebase --abort" to clear broken state) |
178 rebase: (use "hg rebase --abort" to clear broken state) |