equal
deleted
inserted
replaced
|
1 #testcases continuecommand continueflag |
1 Test rebase --continue with rebasestate written by legacy client |
2 Test rebase --continue with rebasestate written by legacy client |
2 |
3 |
3 $ cat >> $HGRCPATH <<EOF |
4 $ cat >> $HGRCPATH <<EOF |
4 > [extensions] |
5 > [extensions] |
5 > rebase= |
6 > rebase= |
6 > drawdag=$TESTDIR/drawdag.py |
7 > drawdag=$TESTDIR/drawdag.py |
7 > EOF |
8 > EOF |
|
9 |
|
10 #if continueflag |
|
11 $ cat >> $HGRCPATH <<EOF |
|
12 > [alias] |
|
13 > continue = rebase --continue |
|
14 > EOF |
|
15 #endif |
8 |
16 |
9 $ hg init |
17 $ hg init |
10 $ hg debugdrawdag <<'EOF' |
18 $ hg debugdrawdag <<'EOF' |
11 > D H |
19 > D H |
12 > | | |
20 > | | |
38 > d2fa1c02b2401b0e32867f26cce50818a4bd796a:0000000000000000000000000000000000000000 |
46 > d2fa1c02b2401b0e32867f26cce50818a4bd796a:0000000000000000000000000000000000000000 |
39 > 6f7a236de6852570cd54649ab62b1012bb78abc8:0000000000000000000000000000000000000000 |
47 > 6f7a236de6852570cd54649ab62b1012bb78abc8:0000000000000000000000000000000000000000 |
40 > 6582e6951a9c48c236f746f186378e36f59f4928:0000000000000000000000000000000000000000 |
48 > 6582e6951a9c48c236f746f186378e36f59f4928:0000000000000000000000000000000000000000 |
41 > EOF |
49 > EOF |
42 |
50 |
43 $ hg rebase --continue |
51 #if continuecommand |
|
52 $ hg continue --dry-run |
|
53 rebase in progress, will be resumed |
|
54 #endif |
|
55 |
|
56 $ hg continue |
44 rebasing 4:c1e6b162678d "B" (B) |
57 rebasing 4:c1e6b162678d "B" (B) |
45 rebasing 8:6f7a236de685 "D" (D) |
58 rebasing 8:6f7a236de685 "D" (D) |
46 rebasing 2:de008c61a447 "E" (E) |
59 rebasing 2:de008c61a447 "E" (E) |
47 rebasing 7:d2fa1c02b240 "G" (G) |
60 rebasing 7:d2fa1c02b240 "G" (G) |
48 rebasing 9:6582e6951a9c "H" (H tip) |
61 rebasing 9:6582e6951a9c "H" (H tip) |