Show More
| @@ -1,89 +1,93 | |||
|
|
1 | 1 | #testcases continuecommand continueflag |
|
|
2 | 2 | Test rebase --continue with rebasestate written by legacy client |
|
|
3 | 3 | |
|
|
4 | 4 | $ cat >> $HGRCPATH <<EOF |
|
|
5 | 5 | > [extensions] |
|
|
6 | 6 | > rebase= |
|
|
7 | 7 | > drawdag=$TESTDIR/drawdag.py |
|
|
8 | 8 | > EOF |
|
|
9 | 9 | |
|
|
10 | 10 | #if continueflag |
|
|
11 | 11 | $ cat >> $HGRCPATH <<EOF |
|
|
12 | 12 | > [alias] |
|
|
13 | 13 | > continue = rebase --continue |
|
|
14 | 14 | > EOF |
|
|
15 | 15 | #endif |
|
|
16 | 16 | |
|
|
17 | 17 | $ hg init |
|
|
18 | 18 | $ hg debugdrawdag <<'EOF' |
|
|
19 | 19 | > D H |
|
|
20 | 20 | > | | |
|
|
21 | 21 | > C G |
|
|
22 | 22 | > | | |
|
|
23 | 23 | > B F |
|
|
24 | 24 | > | | |
|
|
25 | 25 | > Z A E |
|
|
26 | 26 | > \|/ |
|
|
27 | 27 | > R |
|
|
28 | 28 | > EOF |
|
|
29 | $ for r in A B C D E F G H R Z | |
|
|
30 | > do | |
|
|
31 | > eval node_$r=$(hg log -r $r -T '{node}') | |
|
|
32 | > done | |
|
|
29 | 33 | |
|
|
30 | 34 | rebasestate generated by a legacy client running "hg rebase -r B+D+E+G+H -d Z" |
|
|
31 | 35 | |
|
|
32 | 36 | $ touch .hg/last-message.txt |
|
|
33 | 37 | $ cat > .hg/rebasestate <<EOF |
|
|
34 | 38 | > 0000000000000000000000000000000000000000 |
|
|
35 | > f424eb6a8c01c4a0c0fba9f863f79b3eb5b4b69f | |
|
|
39 | > $node_Z | |
|
|
36 | 40 | > 0000000000000000000000000000000000000000 |
|
|
37 | 41 | > 0 |
|
|
38 | 42 | > 0 |
|
|
39 | 43 | > 0 |
|
|
40 | 44 | > |
|
|
41 | > 21a6c45028857f500f56ae84fbf40689c429305b:-2 | |
|
|
42 |
> |
|
|
|
43 |
> |
|
|
|
44 | > aeba276fcb7df8e10153a07ee728d5540693f5aa:-3 | |
|
|
45 | > bd5548558fcf354d37613005737a143871bf3723:-3 | |
|
|
46 |
> |
|
|
|
47 |
> |
|
|
|
48 |
> |
|
|
|
45 | > $node_A:-2 | |
|
|
46 | > $node_E:0000000000000000000000000000000000000000 | |
|
|
47 | > $node_B:0000000000000000000000000000000000000000 | |
|
|
48 | > $node_F:-3 | |
|
|
49 | > $node_C:-3 | |
|
|
50 | > $node_G:0000000000000000000000000000000000000000 | |
|
|
51 | > $node_D:0000000000000000000000000000000000000000 | |
|
|
52 | > $node_H:0000000000000000000000000000000000000000 | |
|
|
49 | 53 | > EOF |
|
|
50 | 54 | |
|
|
51 | 55 | #if continuecommand |
|
|
52 | 56 | $ hg continue --dry-run |
|
|
53 | 57 | rebase in progress, will be resumed |
|
|
54 | 58 | #endif |
|
|
55 | 59 | |
|
|
56 | 60 | $ hg continue |
|
|
57 | 61 | rebasing 4:c1e6b162678d "B" (B) |
|
|
58 | 62 | rebasing 8:6f7a236de685 "D" (D) |
|
|
59 | 63 | rebasing 2:de008c61a447 "E" (E) |
|
|
60 | 64 | rebasing 7:d2fa1c02b240 "G" (G) |
|
|
61 | 65 | rebasing 9:6582e6951a9c "H" (H tip) |
|
|
62 | 66 | warning: orphaned descendants detected, not stripping c1e6b162678d, de008c61a447 |
|
|
63 | 67 | saved backup bundle to $TESTTMP/.hg/strip-backup/6f7a236de685-9880a3dc-rebase.hg |
|
|
64 | 68 | |
|
|
65 | 69 | $ hg log -G -T '{rev}:{node|short} {desc}\n' |
|
|
66 | 70 | o 11:721b8da0a708 H |
|
|
67 | 71 | | |
|
|
68 | 72 | o 10:9d65695ec3c2 G |
|
|
69 | 73 | | |
|
|
70 | 74 | o 9:21c8397a5d68 E |
|
|
71 | 75 | | |
|
|
72 | 76 | | o 8:fc52970345e8 D |
|
|
73 | 77 | | | |
|
|
74 | 78 | | o 7:eac96551b107 B |
|
|
75 | 79 | |/ |
|
|
76 | 80 | | o 6:bd5548558fcf C |
|
|
77 | 81 | | | |
|
|
78 | 82 | | | o 5:aeba276fcb7d F |
|
|
79 | 83 | | | | |
|
|
80 | 84 | | o | 4:c1e6b162678d B |
|
|
81 | 85 | | | | |
|
|
82 | 86 | o | | 3:f424eb6a8c01 Z |
|
|
83 | 87 | | | | |
|
|
84 | 88 | +---o 2:de008c61a447 E |
|
|
85 | 89 | | | |
|
|
86 | 90 | | o 1:21a6c4502885 A |
|
|
87 | 91 | |/ |
|
|
88 | 92 | o 0:b41ce7760717 R |
|
|
89 | 93 | |
General Comments 0
You need to be logged in to leave comments.
Login now