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