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