|
1 Test rebase --continue with rebasestate written by legacy client |
|
2 |
|
3 $ cat >> $HGRCPATH <<EOF |
|
4 > [extensions] |
|
5 > rebase= |
|
6 > drawdag=$TESTDIR/drawdag.py |
|
7 > EOF |
|
8 |
|
9 $ hg init |
|
10 $ hg debugdrawdag <<'EOF' |
|
11 > D H |
|
12 > | | |
|
13 > C G |
|
14 > | | |
|
15 > B F |
|
16 > | | |
|
17 > Z A E |
|
18 > \|/ |
|
19 > R |
|
20 > EOF |
|
21 |
|
22 rebasestate generated by a legacy client running "hg rebase -r B+D+E+G+H -d Z" |
|
23 |
|
24 $ touch .hg/last-message.txt |
|
25 $ cat > .hg/rebasestate <<EOF |
|
26 > 0000000000000000000000000000000000000000 |
|
27 > f424eb6a8c01c4a0c0fba9f863f79b3eb5b4b69f |
|
28 > 0000000000000000000000000000000000000000 |
|
29 > 0 |
|
30 > 0 |
|
31 > 0 |
|
32 > |
|
33 > 21a6c45028857f500f56ae84fbf40689c429305b:-2 |
|
34 > de008c61a447fcfd93f808ef527d933a84048ce7:0000000000000000000000000000000000000000 |
|
35 > c1e6b162678d07d0b204e5c8267d51b4e03b633c:0000000000000000000000000000000000000000 |
|
36 > aeba276fcb7df8e10153a07ee728d5540693f5aa:-3 |
|
37 > bd5548558fcf354d37613005737a143871bf3723:-3 |
|
38 > d2fa1c02b2401b0e32867f26cce50818a4bd796a:0000000000000000000000000000000000000000 |
|
39 > 6f7a236de6852570cd54649ab62b1012bb78abc8:0000000000000000000000000000000000000000 |
|
40 > 6582e6951a9c48c236f746f186378e36f59f4928:0000000000000000000000000000000000000000 |
|
41 > EOF |
|
42 |
|
43 $ hg rebase --continue |
|
44 rebasing 4:c1e6b162678d "B" (B) |
|
45 rebasing 8:6f7a236de685 "D" (D) |
|
46 rebasing 2:de008c61a447 "E" (E) |
|
47 rebasing 7:d2fa1c02b240 "G" (G) |
|
48 rebasing 9:6582e6951a9c "H" (H tip) |
|
49 warning: orphaned descendants detected, not stripping c1e6b162678d, de008c61a447 |
|
50 saved backup bundle to $TESTTMP/.hg/strip-backup/6f7a236de685-9880a3dc-rebase.hg (glob) |
|
51 |
|
52 $ hg log -G -T '{rev}:{node|short} {desc}\n' |
|
53 o 11:721b8da0a708 H |
|
54 | |
|
55 o 10:9d65695ec3c2 G |
|
56 | |
|
57 o 9:21c8397a5d68 E |
|
58 | |
|
59 | o 8:fc52970345e8 D |
|
60 | | |
|
61 | o 7:eac96551b107 B |
|
62 |/ |
|
63 | o 6:bd5548558fcf C |
|
64 | | |
|
65 | | o 5:aeba276fcb7d F |
|
66 | | | |
|
67 | o | 4:c1e6b162678d B |
|
68 | | | |
|
69 o | | 3:f424eb6a8c01 Z |
|
70 | | | |
|
71 +---o 2:de008c61a447 E |
|
72 | | |
|
73 | o 1:21a6c4502885 A |
|
74 |/ |
|
75 o 0:b41ce7760717 R |
|
76 |