##// END OF EJS Templates
phases: update exchange test to include node hash....
Pierre-Yves David -
r15647:ce193147 default
parent child Browse files
Show More
@@ -1,138 +1,139 b''
1 1 $ cat >> $HGRCPATH <<EOF
2 2 > [extensions]
3 3 > graphlog=
4 4 > EOF
5 $ alias hgph='hg log --template "{rev} {phase} {desc}\n"'
5 $ alias hgph='hg log --template "{rev} {phase} {desc} - {node|short}\n"'
6 6
7 7 $ mkcommit() {
8 8 > echo "$1" > "$1"
9 9 > hg add "$1"
10 10 > hg ci -m "$1"
11 11 > }
12 12
13 13 $ hg init alpha
14 14 $ cd alpha
15 15 $ mkcommit a-A
16 16 $ mkcommit a-B
17 17 $ mkcommit a-C
18 18 $ mkcommit a-D
19 19 $ hgph
20 3 1 a-D
21 2 1 a-C
22 1 1 a-B
23 0 1 a-A
20 3 1 a-D - b555f63b6063
21 2 1 a-C - 54acac6f23ab
22 1 1 a-B - 548a3d25dbf0
23 0 1 a-A - 054250a37db4
24 24
25 25 $ hg init ../beta
26 26 $ hg push -r 1 ../beta
27 27 pushing to ../beta
28 28 searching for changes
29 29 adding changesets
30 30 adding manifests
31 31 adding file changes
32 32 added 2 changesets with 2 changes to 2 files
33 33 $ hgph
34 3 1 a-D
35 2 1 a-C
36 1 0 a-B
37 0 0 a-A
34 3 1 a-D - b555f63b6063
35 2 1 a-C - 54acac6f23ab
36 1 0 a-B - 548a3d25dbf0
37 0 0 a-A - 054250a37db4
38 38
39 39 $ cd ../beta
40 40 $ hgph
41 1 0 a-B
42 0 0 a-A
41 1 0 a-B - 548a3d25dbf0
42 0 0 a-A - 054250a37db4
43 43 $ hg up -q
44 44 $ mkcommit b-A
45 45 $ hgph
46 2 1 b-A
47 1 0 a-B
48 0 0 a-A
46 2 1 b-A - f54f1bb90ff3
47 1 0 a-B - 548a3d25dbf0
48 0 0 a-A - 054250a37db4
49 49 $ hg pull ../alpha
50 50 pulling from ../alpha
51 51 searching for changes
52 52 adding changesets
53 53 adding manifests
54 54 adding file changes
55 55 added 2 changesets with 2 changes to 2 files (+1 heads)
56 56 (run 'hg heads' to see heads, 'hg merge' to merge)
57 57 $ hgph
58 4 0 a-D
59 3 0 a-C
60 2 1 b-A
61 1 0 a-B
62 0 0 a-A
58 4 0 a-D - b555f63b6063
59 3 0 a-C - 54acac6f23ab
60 2 1 b-A - f54f1bb90ff3
61 1 0 a-B - 548a3d25dbf0
62 0 0 a-A - 054250a37db4
63 63
64 64 pull did not updated ../alpha state.
65 65 push from alpha to beta should update phase even if nothing is transfered
66 66
67 67 $ cd ../alpha
68 68 $ hgph # not updated by remote pull
69 3 1 a-D
70 2 1 a-C
71 1 0 a-B
72 0 0 a-A
69 3 1 a-D - b555f63b6063
70 2 1 a-C - 54acac6f23ab
71 1 0 a-B - 548a3d25dbf0
72 0 0 a-A - 054250a37db4
73 73 $ hg push ../beta
74 74 pushing to ../beta
75 75 searching for changes
76 76 no changes found
77 77 $ hgph
78 3 0 a-D
79 2 0 a-C
80 1 0 a-B
81 0 0 a-A
78 3 0 a-D - b555f63b6063
79 2 0 a-C - 54acac6f23ab
80 1 0 a-B - 548a3d25dbf0
81 0 0 a-A - 054250a37db4
82 82
83 83 update must update phase of common changeset too
84 84
85 85 $ hg pull ../beta # getting b-A
86 86 pulling from ../beta
87 87 searching for changes
88 88 adding changesets
89 89 adding manifests
90 90 adding file changes
91 91 added 1 changesets with 1 changes to 1 files (+1 heads)
92 92 (run 'hg heads' to see heads, 'hg merge' to merge)
93 93
94 94 $ cd ../beta
95 95 $ hgph # not updated by remote pull
96 4 0 a-D
97 3 0 a-C
98 2 1 b-A
99 1 0 a-B
100 0 0 a-A
96 4 0 a-D - b555f63b6063
97 3 0 a-C - 54acac6f23ab
98 2 1 b-A - f54f1bb90ff3
99 1 0 a-B - 548a3d25dbf0
100 0 0 a-A - 054250a37db4
101 101 $ hg pull ../alpha
102 102 pulling from ../alpha
103 103 searching for changes
104 104 no changes found
105 105 $ hgph
106 4 0 a-D
107 3 0 a-C
108 2 0 b-A
109 1 0 a-B
110 0 0 a-A
106 4 0 a-D - b555f63b6063
107 3 0 a-C - 54acac6f23ab
108 2 0 b-A - f54f1bb90ff3
109 1 0 a-B - 548a3d25dbf0
110 0 0 a-A - 054250a37db4
111 111
112 112 Publish configuration option
113 113 ----------------------------
114 114
115 115 changegroup are added without phase movement
116 116
117 117 $ hg bundle -a ../base.bundle
118 118 5 changesets found
119 119 $ cd ..
120 120 $ hg init mu
121 121 $ cd mu
122 122 $ cat > .hg/hgrc << EOF
123 123 > [phases]
124 124 > publish=0
125 125 > EOF
126 126 $ hg unbundle ../base.bundle
127 127 adding changesets
128 128 adding manifests
129 129 adding file changes
130 130 added 5 changesets with 5 changes to 5 files (+1 heads)
131 131 (run 'hg heads' to see heads, 'hg merge' to merge)
132 132 $ hgph
133 4 1 a-D
134 3 1 a-C
135 2 1 b-A
136 1 1 a-B
137 0 1 a-A
133 4 1 a-D - b555f63b6063
134 3 1 a-C - 54acac6f23ab
135 2 1 b-A - f54f1bb90ff3
136 1 1 a-B - 548a3d25dbf0
137 0 1 a-A - 054250a37db4
138 $ cd ..
138 139
General Comments 0
You need to be logged in to leave comments. Login now