##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

phases: use graph and phase name in exchange test
Pierre-Yves David -
r15824:94a4748d default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
This diff has been collapsed as it changes many lines, (755 lines changed) Show them Hide them
@@ -2,7 +2,7
2 > [extensions]
2 > [extensions]
3 > graphlog=
3 > graphlog=
4 > EOF
4 > EOF
5 $ alias hgph='hg log --template "{rev} {phaseidx} {desc} - {node|short}\n"'
5 $ alias hgph='hg log -G --template "{rev} {phase} {desc} - {node|short}\n"'
6
6
7 $ mkcommit() {
7 $ mkcommit() {
8 > echo "$1" > "$1"
8 > echo "$1" > "$1"
@@ -19,10 +19,14
19 $ mkcommit a-C
19 $ mkcommit a-C
20 $ mkcommit a-D
20 $ mkcommit a-D
21 $ hgph
21 $ hgph
22 3 1 a-D - b555f63b6063
22 @ 3 draft a-D - b555f63b6063
23 2 1 a-C - 54acac6f23ab
23 |
24 1 1 a-B - 548a3d25dbf0
24 o 2 draft a-C - 54acac6f23ab
25 0 1 a-A - 054250a37db4
25 |
26 o 1 draft a-B - 548a3d25dbf0
27 |
28 o 0 draft a-A - 054250a37db4
29
26
30
27 $ hg init ../beta
31 $ hg init ../beta
28 $ hg push -r 1 ../beta
32 $ hg push -r 1 ../beta
@@ -33,21 +37,30
33 adding file changes
37 adding file changes
34 added 2 changesets with 2 changes to 2 files
38 added 2 changesets with 2 changes to 2 files
35 $ hgph
39 $ hgph
36 3 1 a-D - b555f63b6063
40 @ 3 draft a-D - b555f63b6063
37 2 1 a-C - 54acac6f23ab
41 |
38 1 0 a-B - 548a3d25dbf0
42 o 2 draft a-C - 54acac6f23ab
39 0 0 a-A - 054250a37db4
43 |
44 o 1 public a-B - 548a3d25dbf0
45 |
46 o 0 public a-A - 054250a37db4
47
40
48
41 $ cd ../beta
49 $ cd ../beta
42 $ hgph
50 $ hgph
43 1 0 a-B - 548a3d25dbf0
51 o 1 public a-B - 548a3d25dbf0
44 0 0 a-A - 054250a37db4
52 |
53 o 0 public a-A - 054250a37db4
54
45 $ hg up -q
55 $ hg up -q
46 $ mkcommit b-A
56 $ mkcommit b-A
47 $ hgph
57 $ hgph
48 2 1 b-A - f54f1bb90ff3
58 @ 2 draft b-A - f54f1bb90ff3
49 1 0 a-B - 548a3d25dbf0
59 |
50 0 0 a-A - 054250a37db4
60 o 1 public a-B - 548a3d25dbf0
61 |
62 o 0 public a-A - 054250a37db4
63
51 $ hg pull ../alpha
64 $ hg pull ../alpha
52 pulling from ../alpha
65 pulling from ../alpha
53 searching for changes
66 searching for changes
@@ -57,30 +70,43
57 added 2 changesets with 2 changes to 2 files (+1 heads)
70 added 2 changesets with 2 changes to 2 files (+1 heads)
58 (run 'hg heads' to see heads, 'hg merge' to merge)
71 (run 'hg heads' to see heads, 'hg merge' to merge)
59 $ hgph
72 $ hgph
60 4 0 a-D - b555f63b6063
73 o 4 public a-D - b555f63b6063
61 3 0 a-C - 54acac6f23ab
74 |
62 2 1 b-A - f54f1bb90ff3
75 o 3 public a-C - 54acac6f23ab
63 1 0 a-B - 548a3d25dbf0
76 |
64 0 0 a-A - 054250a37db4
77 | @ 2 draft b-A - f54f1bb90ff3
78 |/
79 o 1 public a-B - 548a3d25dbf0
80 |
81 o 0 public a-A - 054250a37db4
82
65
83
66 pull did not updated ../alpha state.
84 pull did not updated ../alpha state.
67 push from alpha to beta should update phase even if nothing is transfered
85 push from alpha to beta should update phase even if nothing is transfered
68
86
69 $ cd ../alpha
87 $ cd ../alpha
70 $ hgph # not updated by remote pull
88 $ hgph # not updated by remote pull
71 3 1 a-D - b555f63b6063
89 @ 3 draft a-D - b555f63b6063
72 2 1 a-C - 54acac6f23ab
90 |
73 1 0 a-B - 548a3d25dbf0
91 o 2 draft a-C - 54acac6f23ab
74 0 0 a-A - 054250a37db4
92 |
93 o 1 public a-B - 548a3d25dbf0
94 |
95 o 0 public a-A - 054250a37db4
96
75 $ hg push ../beta
97 $ hg push ../beta
76 pushing to ../beta
98 pushing to ../beta
77 searching for changes
99 searching for changes
78 no changes found
100 no changes found
79 $ hgph
101 $ hgph
80 3 0 a-D - b555f63b6063
102 @ 3 public a-D - b555f63b6063
81 2 0 a-C - 54acac6f23ab
103 |
82 1 0 a-B - 548a3d25dbf0
104 o 2 public a-C - 54acac6f23ab
83 0 0 a-A - 054250a37db4
105 |
106 o 1 public a-B - 548a3d25dbf0
107 |
108 o 0 public a-A - 054250a37db4
109
84
110
85 update must update phase of common changeset too
111 update must update phase of common changeset too
86
112
@@ -95,21 +121,31 update must update phase of common chang
95
121
96 $ cd ../beta
122 $ cd ../beta
97 $ hgph # not updated by remote pull
123 $ hgph # not updated by remote pull
98 4 0 a-D - b555f63b6063
124 o 4 public a-D - b555f63b6063
99 3 0 a-C - 54acac6f23ab
125 |
100 2 1 b-A - f54f1bb90ff3
126 o 3 public a-C - 54acac6f23ab
101 1 0 a-B - 548a3d25dbf0
127 |
102 0 0 a-A - 054250a37db4
128 | @ 2 draft b-A - f54f1bb90ff3
129 |/
130 o 1 public a-B - 548a3d25dbf0
131 |
132 o 0 public a-A - 054250a37db4
133
103 $ hg pull ../alpha
134 $ hg pull ../alpha
104 pulling from ../alpha
135 pulling from ../alpha
105 searching for changes
136 searching for changes
106 no changes found
137 no changes found
107 $ hgph
138 $ hgph
108 4 0 a-D - b555f63b6063
139 o 4 public a-D - b555f63b6063
109 3 0 a-C - 54acac6f23ab
140 |
110 2 0 b-A - f54f1bb90ff3
141 o 3 public a-C - 54acac6f23ab
111 1 0 a-B - 548a3d25dbf0
142 |
112 0 0 a-A - 054250a37db4
143 | @ 2 public b-A - f54f1bb90ff3
144 |/
145 o 1 public a-B - 548a3d25dbf0
146 |
147 o 0 public a-A - 054250a37db4
148
113
149
114 Publish configuration option
150 Publish configuration option
115 ----------------------------
151 ----------------------------
@@ -135,11 +171,16 changegroup are added without phase move
135 added 5 changesets with 5 changes to 5 files (+1 heads)
171 added 5 changesets with 5 changes to 5 files (+1 heads)
136 (run 'hg heads' to see heads, 'hg merge' to merge)
172 (run 'hg heads' to see heads, 'hg merge' to merge)
137 $ hgph
173 $ hgph
138 4 1 a-D - b555f63b6063
174 o 4 draft a-D - b555f63b6063
139 3 1 a-C - 54acac6f23ab
175 |
140 2 1 b-A - f54f1bb90ff3
176 o 3 draft a-C - 54acac6f23ab
141 1 1 a-B - 548a3d25dbf0
177 |
142 0 1 a-A - 054250a37db4
178 | o 2 draft b-A - f54f1bb90ff3
179 |/
180 o 1 draft a-B - 548a3d25dbf0
181 |
182 o 0 draft a-A - 054250a37db4
183
143 $ cd ..
184 $ cd ..
144
185
145 Pulling from publish=False to publish=False does not move boundary.
186 Pulling from publish=False to publish=False does not move boundary.
@@ -158,9 +199,12 Pulling from publish=False to publish=Fa
158 added 3 changesets with 3 changes to 3 files
199 added 3 changesets with 3 changes to 3 files
159 (run 'hg update' to get a working copy)
200 (run 'hg update' to get a working copy)
160 $ hgph
201 $ hgph
161 2 1 a-C - 54acac6f23ab
202 o 2 draft a-C - 54acac6f23ab
162 1 1 a-B - 548a3d25dbf0
203 |
163 0 1 a-A - 054250a37db4
204 o 1 draft a-B - 548a3d25dbf0
205 |
206 o 0 draft a-A - 054250a37db4
207
164
208
165 Even for common
209 Even for common
166
210
@@ -173,10 +217,14 Even for common
173 added 1 changesets with 1 changes to 1 files (+1 heads)
217 added 1 changesets with 1 changes to 1 files (+1 heads)
174 (run 'hg heads' to see heads, 'hg merge' to merge)
218 (run 'hg heads' to see heads, 'hg merge' to merge)
175 $ hgph
219 $ hgph
176 3 1 b-A - f54f1bb90ff3
220 o 3 draft b-A - f54f1bb90ff3
177 2 1 a-C - 54acac6f23ab
221 |
178 1 1 a-B - 548a3d25dbf0
222 | o 2 draft a-C - 54acac6f23ab
179 0 1 a-A - 054250a37db4
223 |/
224 o 1 draft a-B - 548a3d25dbf0
225 |
226 o 0 draft a-A - 054250a37db4
227
180
228
181
229
182 Pulling from Publish=True to Publish=False move boundary in common set.
230 Pulling from Publish=True to Publish=False move boundary in common set.
@@ -191,11 +239,16 we are in nu
191 added 1 changesets with 1 changes to 1 files
239 added 1 changesets with 1 changes to 1 files
192 (run 'hg update' to get a working copy)
240 (run 'hg update' to get a working copy)
193 $ hgph
241 $ hgph
194 4 0 a-D - b555f63b6063
242 o 4 public a-D - b555f63b6063
195 3 0 b-A - f54f1bb90ff3
243 |
196 2 0 a-C - 54acac6f23ab
244 | o 3 public b-A - f54f1bb90ff3
197 1 0 a-B - 548a3d25dbf0
245 | |
198 0 0 a-A - 054250a37db4
246 o | 2 public a-C - 54acac6f23ab
247 |/
248 o 1 public a-B - 548a3d25dbf0
249 |
250 o 0 public a-A - 054250a37db4
251
199
252
200 pulling from Publish=False to publish=False with some public
253 pulling from Publish=False to publish=False with some public
201
254
@@ -203,13 +256,20 pulling from Publish=False to publish=Fa
203 $ mkcommit n-A
256 $ mkcommit n-A
204 $ mkcommit n-B
257 $ mkcommit n-B
205 $ hgph
258 $ hgph
206 6 1 n-B - 145e75495359
259 @ 6 draft n-B - 145e75495359
207 5 1 n-A - d6bcb4f74035
260 |
208 4 0 a-D - b555f63b6063
261 o 5 draft n-A - d6bcb4f74035
209 3 0 b-A - f54f1bb90ff3
262 |
210 2 0 a-C - 54acac6f23ab
263 | o 4 public a-D - b555f63b6063
211 1 0 a-B - 548a3d25dbf0
264 | |
212 0 0 a-A - 054250a37db4
265 o | 3 public b-A - f54f1bb90ff3
266 | |
267 | o 2 public a-C - 54acac6f23ab
268 |/
269 o 1 public a-B - 548a3d25dbf0
270 |
271 o 0 public a-A - 054250a37db4
272
213 $ cd ../mu
273 $ cd ../mu
214 $ hg pull ../nu
274 $ hg pull ../nu
215 pulling from ../nu
275 pulling from ../nu
@@ -220,24 +280,36 pulling from Publish=False to publish=Fa
220 added 2 changesets with 2 changes to 2 files
280 added 2 changesets with 2 changes to 2 files
221 (run 'hg update' to get a working copy)
281 (run 'hg update' to get a working copy)
222 $ hgph
282 $ hgph
223 6 1 n-B - 145e75495359
283 o 6 draft n-B - 145e75495359
224 5 1 n-A - d6bcb4f74035
284 |
225 4 0 a-D - b555f63b6063
285 o 5 draft n-A - d6bcb4f74035
226 3 0 a-C - 54acac6f23ab
286 |
227 2 0 b-A - f54f1bb90ff3
287 | o 4 public a-D - b555f63b6063
228 1 0 a-B - 548a3d25dbf0
288 | |
229 0 0 a-A - 054250a37db4
289 | o 3 public a-C - 54acac6f23ab
290 | |
291 o | 2 public b-A - f54f1bb90ff3
292 |/
293 o 1 public a-B - 548a3d25dbf0
294 |
295 o 0 public a-A - 054250a37db4
296
230 $ cd ..
297 $ cd ..
231
298
232 pulling into publish=True
299 pulling into publish=True
233
300
234 $ cd alpha
301 $ cd alpha
235 $ hgph
302 $ hgph
236 4 0 b-A - f54f1bb90ff3
303 o 4 public b-A - f54f1bb90ff3
237 3 0 a-D - b555f63b6063
304 |
238 2 0 a-C - 54acac6f23ab
305 | @ 3 public a-D - b555f63b6063
239 1 0 a-B - 548a3d25dbf0
306 | |
240 0 0 a-A - 054250a37db4
307 | o 2 public a-C - 54acac6f23ab
308 |/
309 o 1 public a-B - 548a3d25dbf0
310 |
311 o 0 public a-A - 054250a37db4
312
241 $ hg pull ../mu
313 $ hg pull ../mu
242 pulling from ../mu
314 pulling from ../mu
243 searching for changes
315 searching for changes
@@ -247,13 +319,20 pulling into publish=True
247 added 2 changesets with 2 changes to 2 files
319 added 2 changesets with 2 changes to 2 files
248 (run 'hg update' to get a working copy)
320 (run 'hg update' to get a working copy)
249 $ hgph
321 $ hgph
250 6 1 n-B - 145e75495359
322 o 6 draft n-B - 145e75495359
251 5 1 n-A - d6bcb4f74035
323 |
252 4 0 b-A - f54f1bb90ff3
324 o 5 draft n-A - d6bcb4f74035
253 3 0 a-D - b555f63b6063
325 |
254 2 0 a-C - 54acac6f23ab
326 o 4 public b-A - f54f1bb90ff3
255 1 0 a-B - 548a3d25dbf0
327 |
256 0 0 a-A - 054250a37db4
328 | @ 3 public a-D - b555f63b6063
329 | |
330 | o 2 public a-C - 54acac6f23ab
331 |/
332 o 1 public a-B - 548a3d25dbf0
333 |
334 o 0 public a-A - 054250a37db4
335
257 $ cd ..
336 $ cd ..
258
337
259 pulling back into original repo
338 pulling back into original repo
@@ -264,13 +343,20 pulling back into original repo
264 searching for changes
343 searching for changes
265 no changes found
344 no changes found
266 $ hgph
345 $ hgph
267 6 0 n-B - 145e75495359
346 @ 6 public n-B - 145e75495359
268 5 0 n-A - d6bcb4f74035
347 |
269 4 0 a-D - b555f63b6063
348 o 5 public n-A - d6bcb4f74035
270 3 0 b-A - f54f1bb90ff3
349 |
271 2 0 a-C - 54acac6f23ab
350 | o 4 public a-D - b555f63b6063
272 1 0 a-B - 548a3d25dbf0
351 | |
273 0 0 a-A - 054250a37db4
352 o | 3 public b-A - f54f1bb90ff3
353 | |
354 | o 2 public a-C - 54acac6f23ab
355 |/
356 o 1 public a-B - 548a3d25dbf0
357 |
358 o 0 public a-A - 054250a37db4
359
274
360
275 Push
361 Push
276 ````
362 ````
@@ -289,13 +375,20 Push back to alpha
289 $ cd ..
375 $ cd ..
290 $ cd alpha
376 $ cd alpha
291 $ hgph
377 $ hgph
292 6 0 n-B - 145e75495359
378 o 6 public n-B - 145e75495359
293 5 0 n-A - d6bcb4f74035
379 |
294 4 0 b-A - f54f1bb90ff3
380 o 5 public n-A - d6bcb4f74035
295 3 0 a-D - b555f63b6063
381 |
296 2 0 a-C - 54acac6f23ab
382 o 4 public b-A - f54f1bb90ff3
297 1 0 a-B - 548a3d25dbf0
383 |
298 0 0 a-A - 054250a37db4
384 | @ 3 public a-D - b555f63b6063
385 | |
386 | o 2 public a-C - 54acac6f23ab
387 |/
388 o 1 public a-B - 548a3d25dbf0
389 |
390 o 0 public a-A - 054250a37db4
391
299
392
300 (end insertion)
393 (end insertion)
301
394
@@ -347,17 +440,28 initial setup
347 $ mkcommit a-H
440 $ mkcommit a-H
348 created new head
441 created new head
349 $ hgph
442 $ hgph
350 10 1 a-H - 967b449fbc94
443 @ 10 draft a-H - 967b449fbc94
351 9 1 a-G - 3e27b6f1eee1
444 |
352 8 1 a-F - b740e3e5c05d
445 | o 9 draft a-G - 3e27b6f1eee1
353 7 1 a-E - e9f537e46dea
446 | |
354 6 0 n-B - 145e75495359
447 | o 8 draft a-F - b740e3e5c05d
355 5 0 n-A - d6bcb4f74035
448 | |
356 4 0 b-A - f54f1bb90ff3
449 | o 7 draft a-E - e9f537e46dea
357 3 0 a-D - b555f63b6063
450 | |
358 2 0 a-C - 54acac6f23ab
451 +---o 6 public n-B - 145e75495359
359 1 0 a-B - 548a3d25dbf0
452 | |
360 0 0 a-A - 054250a37db4
453 o | 5 public n-A - d6bcb4f74035
454 | |
455 o | 4 public b-A - f54f1bb90ff3
456 | |
457 | o 3 public a-D - b555f63b6063
458 | |
459 | o 2 public a-C - 54acac6f23ab
460 |/
461 o 1 public a-B - 548a3d25dbf0
462 |
463 o 0 public a-A - 054250a37db4
464
361
465
362 Pushing to Publish=False (unknown changeset)
466 Pushing to Publish=False (unknown changeset)
363
467
@@ -369,29 +473,49 Pushing to Publish=False (unknown change
369 adding file changes
473 adding file changes
370 added 2 changesets with 2 changes to 2 files
474 added 2 changesets with 2 changes to 2 files
371 $ hgph
475 $ hgph
372 10 1 a-H - 967b449fbc94
476 @ 10 draft a-H - 967b449fbc94
373 9 1 a-G - 3e27b6f1eee1
477 |
374 8 1 a-F - b740e3e5c05d
478 | o 9 draft a-G - 3e27b6f1eee1
375 7 1 a-E - e9f537e46dea
479 | |
376 6 0 n-B - 145e75495359
480 | o 8 draft a-F - b740e3e5c05d
377 5 0 n-A - d6bcb4f74035
481 | |
378 4 0 b-A - f54f1bb90ff3
482 | o 7 draft a-E - e9f537e46dea
379 3 0 a-D - b555f63b6063
483 | |
380 2 0 a-C - 54acac6f23ab
484 +---o 6 public n-B - 145e75495359
381 1 0 a-B - 548a3d25dbf0
485 | |
382 0 0 a-A - 054250a37db4
486 o | 5 public n-A - d6bcb4f74035
487 | |
488 o | 4 public b-A - f54f1bb90ff3
489 | |
490 | o 3 public a-D - b555f63b6063
491 | |
492 | o 2 public a-C - 54acac6f23ab
493 |/
494 o 1 public a-B - 548a3d25dbf0
495 |
496 o 0 public a-A - 054250a37db4
497
383
498
384 $ cd ../mu
499 $ cd ../mu
385 $ hgph # d6bcb4f74035 and 145e75495359 changed because common is too smart
500 $ hgph # d6bcb4f74035 and 145e75495359 changed because common is too smart
386 8 1 a-F - b740e3e5c05d
501 o 8 draft a-F - b740e3e5c05d
387 7 1 a-E - e9f537e46dea
502 |
388 6 0 n-B - 145e75495359
503 o 7 draft a-E - e9f537e46dea
389 5 0 n-A - d6bcb4f74035
504 |
390 4 0 a-D - b555f63b6063
505 | o 6 public n-B - 145e75495359
391 3 0 a-C - 54acac6f23ab
506 | |
392 2 0 b-A - f54f1bb90ff3
507 | o 5 public n-A - d6bcb4f74035
393 1 0 a-B - 548a3d25dbf0
508 | |
394 0 0 a-A - 054250a37db4
509 o | 4 public a-D - b555f63b6063
510 | |
511 o | 3 public a-C - 54acac6f23ab
512 | |
513 | o 2 public b-A - f54f1bb90ff3
514 |/
515 o 1 public a-B - 548a3d25dbf0
516 |
517 o 0 public a-A - 054250a37db4
518
395
519
396 Pushing to Publish=True (unknown changeset)
520 Pushing to Publish=True (unknown changeset)
397
521
@@ -403,15 +527,24 Pushing to Publish=True (unknown changes
403 adding file changes
527 adding file changes
404 added 2 changesets with 2 changes to 2 files
528 added 2 changesets with 2 changes to 2 files
405 $ hgph # again d6bcb4f74035 and 145e75495359 changed because common is too smart
529 $ hgph # again d6bcb4f74035 and 145e75495359 changed because common is too smart
406 8 0 a-F - b740e3e5c05d
530 o 8 public a-F - b740e3e5c05d
407 7 0 a-E - e9f537e46dea
531 |
408 6 0 n-B - 145e75495359
532 o 7 public a-E - e9f537e46dea
409 5 0 n-A - d6bcb4f74035
533 |
410 4 0 a-D - b555f63b6063
534 | o 6 public n-B - 145e75495359
411 3 0 a-C - 54acac6f23ab
535 | |
412 2 0 b-A - f54f1bb90ff3
536 | o 5 public n-A - d6bcb4f74035
413 1 0 a-B - 548a3d25dbf0
537 | |
414 0 0 a-A - 054250a37db4
538 o | 4 public a-D - b555f63b6063
539 | |
540 o | 3 public a-C - 54acac6f23ab
541 | |
542 | o 2 public b-A - f54f1bb90ff3
543 |/
544 o 1 public a-B - 548a3d25dbf0
545 |
546 o 0 public a-A - 054250a37db4
547
415
548
416 Pushing to Publish=True (common changeset)
549 Pushing to Publish=True (common changeset)
417
550
@@ -421,26 +554,44 Pushing to Publish=True (common changese
421 searching for changes
554 searching for changes
422 no changes found
555 no changes found
423 $ hgph
556 $ hgph
424 6 0 a-F - b740e3e5c05d
557 o 6 public a-F - b740e3e5c05d
425 5 0 a-E - e9f537e46dea
558 |
426 4 0 a-D - b555f63b6063
559 o 5 public a-E - e9f537e46dea
427 3 0 a-C - 54acac6f23ab
560 |
428 2 0 b-A - f54f1bb90ff3
561 o 4 public a-D - b555f63b6063
429 1 0 a-B - 548a3d25dbf0
562 |
430 0 0 a-A - 054250a37db4
563 o 3 public a-C - 54acac6f23ab
564 |
565 | @ 2 public b-A - f54f1bb90ff3
566 |/
567 o 1 public a-B - 548a3d25dbf0
568 |
569 o 0 public a-A - 054250a37db4
570
431 $ cd ../alpha
571 $ cd ../alpha
432 $ hgph # e9f537e46dea and b740e3e5c05d should have been sync to 0
572 $ hgph # e9f537e46dea and b740e3e5c05d should have been sync to 0
433 10 1 a-H - 967b449fbc94
573 @ 10 draft a-H - 967b449fbc94
434 9 1 a-G - 3e27b6f1eee1
574 |
435 8 0 a-F - b740e3e5c05d
575 | o 9 draft a-G - 3e27b6f1eee1
436 7 0 a-E - e9f537e46dea
576 | |
437 6 0 n-B - 145e75495359
577 | o 8 public a-F - b740e3e5c05d
438 5 0 n-A - d6bcb4f74035
578 | |
439 4 0 b-A - f54f1bb90ff3
579 | o 7 public a-E - e9f537e46dea
440 3 0 a-D - b555f63b6063
580 | |
441 2 0 a-C - 54acac6f23ab
581 +---o 6 public n-B - 145e75495359
442 1 0 a-B - 548a3d25dbf0
582 | |
443 0 0 a-A - 054250a37db4
583 o | 5 public n-A - d6bcb4f74035
584 | |
585 o | 4 public b-A - f54f1bb90ff3
586 | |
587 | o 3 public a-D - b555f63b6063
588 | |
589 | o 2 public a-C - 54acac6f23ab
590 |/
591 o 1 public a-B - 548a3d25dbf0
592 |
593 o 0 public a-A - 054250a37db4
594
444
595
445 Pushing to Publish=False (common changeset that change phase + unknown one)
596 Pushing to Publish=False (common changeset that change phase + unknown one)
446
597
@@ -452,30 +603,51 Pushing to Publish=False (common changes
452 adding file changes
603 adding file changes
453 added 1 changesets with 1 changes to 1 files (+1 heads)
604 added 1 changesets with 1 changes to 1 files (+1 heads)
454 $ hgph
605 $ hgph
455 10 1 a-H - 967b449fbc94
606 @ 10 draft a-H - 967b449fbc94
456 9 1 a-G - 3e27b6f1eee1
607 |
457 8 0 a-F - b740e3e5c05d
608 | o 9 draft a-G - 3e27b6f1eee1
458 7 0 a-E - e9f537e46dea
609 | |
459 6 0 n-B - 145e75495359
610 | o 8 public a-F - b740e3e5c05d
460 5 0 n-A - d6bcb4f74035
611 | |
461 4 0 b-A - f54f1bb90ff3
612 | o 7 public a-E - e9f537e46dea
462 3 0 a-D - b555f63b6063
613 | |
463 2 0 a-C - 54acac6f23ab
614 +---o 6 public n-B - 145e75495359
464 1 0 a-B - 548a3d25dbf0
615 | |
465 0 0 a-A - 054250a37db4
616 o | 5 public n-A - d6bcb4f74035
617 | |
618 o | 4 public b-A - f54f1bb90ff3
619 | |
620 | o 3 public a-D - b555f63b6063
621 | |
622 | o 2 public a-C - 54acac6f23ab
623 |/
624 o 1 public a-B - 548a3d25dbf0
625 |
626 o 0 public a-A - 054250a37db4
627
466 $ cd ../mu
628 $ cd ../mu
467 $ hgph # d6bcb4f74035 should have changed phase
629 $ hgph # d6bcb4f74035 should have changed phase
468 > # again d6bcb4f74035 and 145e75495359 changed because common was too smart
630 > # again d6bcb4f74035 and 145e75495359 changed because common was too smart
469 9 1 a-H - 967b449fbc94
631 o 9 draft a-H - 967b449fbc94
470 8 0 a-F - b740e3e5c05d
632 |
471 7 0 a-E - e9f537e46dea
633 | o 8 public a-F - b740e3e5c05d
472 6 0 n-B - 145e75495359
634 | |
473 5 0 n-A - d6bcb4f74035
635 | o 7 public a-E - e9f537e46dea
474 4 0 a-D - b555f63b6063
636 | |
475 3 0 a-C - 54acac6f23ab
637 +---o 6 public n-B - 145e75495359
476 2 0 b-A - f54f1bb90ff3
638 | |
477 1 0 a-B - 548a3d25dbf0
639 o | 5 public n-A - d6bcb4f74035
478 0 0 a-A - 054250a37db4
640 | |
641 | o 4 public a-D - b555f63b6063
642 | |
643 | o 3 public a-C - 54acac6f23ab
644 | |
645 o | 2 public b-A - f54f1bb90ff3
646 |/
647 o 1 public a-B - 548a3d25dbf0
648 |
649 o 0 public a-A - 054250a37db4
650
479
651
480
652
481 Pushing to Publish=True (common changeset from publish=False)
653 Pushing to Publish=True (common changeset from publish=False)
@@ -486,28 +658,49 Pushing to Publish=True (common changese
486 searching for changes
658 searching for changes
487 no changes found
659 no changes found
488 $ hgph
660 $ hgph
489 9 0 a-H - 967b449fbc94
661 o 9 public a-H - 967b449fbc94
490 8 0 a-F - b740e3e5c05d
662 |
491 7 0 a-E - e9f537e46dea
663 | o 8 public a-F - b740e3e5c05d
492 6 0 n-B - 145e75495359
664 | |
493 5 0 n-A - d6bcb4f74035
665 | o 7 public a-E - e9f537e46dea
494 4 0 a-D - b555f63b6063
666 | |
495 3 0 a-C - 54acac6f23ab
667 +---o 6 public n-B - 145e75495359
496 2 0 b-A - f54f1bb90ff3
668 | |
497 1 0 a-B - 548a3d25dbf0
669 o | 5 public n-A - d6bcb4f74035
498 0 0 a-A - 054250a37db4
670 | |
671 | o 4 public a-D - b555f63b6063
672 | |
673 | o 3 public a-C - 54acac6f23ab
674 | |
675 o | 2 public b-A - f54f1bb90ff3
676 |/
677 o 1 public a-B - 548a3d25dbf0
678 |
679 o 0 public a-A - 054250a37db4
680
499 $ hgph -R ../alpha # a-H should have been synced to 0
681 $ hgph -R ../alpha # a-H should have been synced to 0
500 10 0 a-H - 967b449fbc94
682 @ 10 public a-H - 967b449fbc94
501 9 1 a-G - 3e27b6f1eee1
683 |
502 8 0 a-F - b740e3e5c05d
684 | o 9 draft a-G - 3e27b6f1eee1
503 7 0 a-E - e9f537e46dea
685 | |
504 6 0 n-B - 145e75495359
686 | o 8 public a-F - b740e3e5c05d
505 5 0 n-A - d6bcb4f74035
687 | |
506 4 0 b-A - f54f1bb90ff3
688 | o 7 public a-E - e9f537e46dea
507 3 0 a-D - b555f63b6063
689 | |
508 2 0 a-C - 54acac6f23ab
690 +---o 6 public n-B - 145e75495359
509 1 0 a-B - 548a3d25dbf0
691 | |
510 0 0 a-A - 054250a37db4
692 o | 5 public n-A - d6bcb4f74035
693 | |
694 o | 4 public b-A - f54f1bb90ff3
695 | |
696 | o 3 public a-D - b555f63b6063
697 | |
698 | o 2 public a-C - 54acac6f23ab
699 |/
700 o 1 public a-B - 548a3d25dbf0
701 |
702 o 0 public a-A - 054250a37db4
703
511
704
512
705
513 Discovery locally secret changeset on a remote repository:
706 Discovery locally secret changeset on a remote repository:
@@ -517,18 +710,30 Discovery locally secret changeset on a
517 $ cd ../alpha
710 $ cd ../alpha
518 $ mkcommit A-secret --config phases.new-commit=2
711 $ mkcommit A-secret --config phases.new-commit=2
519 $ hgph
712 $ hgph
520 11 2 A-secret - 435b5d83910c
713 @ 11 secret A-secret - 435b5d83910c
521 10 0 a-H - 967b449fbc94
714 |
522 9 1 a-G - 3e27b6f1eee1
715 o 10 public a-H - 967b449fbc94
523 8 0 a-F - b740e3e5c05d
716 |
524 7 0 a-E - e9f537e46dea
717 | o 9 draft a-G - 3e27b6f1eee1
525 6 0 n-B - 145e75495359
718 | |
526 5 0 n-A - d6bcb4f74035
719 | o 8 public a-F - b740e3e5c05d
527 4 0 b-A - f54f1bb90ff3
720 | |
528 3 0 a-D - b555f63b6063
721 | o 7 public a-E - e9f537e46dea
529 2 0 a-C - 54acac6f23ab
722 | |
530 1 0 a-B - 548a3d25dbf0
723 +---o 6 public n-B - 145e75495359
531 0 0 a-A - 054250a37db4
724 | |
725 o | 5 public n-A - d6bcb4f74035
726 | |
727 o | 4 public b-A - f54f1bb90ff3
728 | |
729 | o 3 public a-D - b555f63b6063
730 | |
731 | o 2 public a-C - 54acac6f23ab
732 |/
733 o 1 public a-B - 548a3d25dbf0
734 |
735 o 0 public a-A - 054250a37db4
736
532 $ hg bundle --base 'parents(.)' -r . ../secret-bundle.hg
737 $ hg bundle --base 'parents(.)' -r . ../secret-bundle.hg
533 1 changesets found
738 1 changesets found
534 $ hg -R ../mu unbundle ../secret-bundle.hg
739 $ hg -R ../mu unbundle ../secret-bundle.hg
@@ -538,34 +743,57 Discovery locally secret changeset on a
538 added 1 changesets with 1 changes to 1 files
743 added 1 changesets with 1 changes to 1 files
539 (run 'hg update' to get a working copy)
744 (run 'hg update' to get a working copy)
540 $ hgph -R ../mu
745 $ hgph -R ../mu
541 10 1 A-secret - 435b5d83910c
746 o 10 draft A-secret - 435b5d83910c
542 9 0 a-H - 967b449fbc94
747 |
543 8 0 a-F - b740e3e5c05d
748 o 9 public a-H - 967b449fbc94
544 7 0 a-E - e9f537e46dea
749 |
545 6 0 n-B - 145e75495359
750 | o 8 public a-F - b740e3e5c05d
546 5 0 n-A - d6bcb4f74035
751 | |
547 4 0 a-D - b555f63b6063
752 | o 7 public a-E - e9f537e46dea
548 3 0 a-C - 54acac6f23ab
753 | |
549 2 0 b-A - f54f1bb90ff3
754 +---o 6 public n-B - 145e75495359
550 1 0 a-B - 548a3d25dbf0
755 | |
551 0 0 a-A - 054250a37db4
756 o | 5 public n-A - d6bcb4f74035
757 | |
758 | o 4 public a-D - b555f63b6063
759 | |
760 | o 3 public a-C - 54acac6f23ab
761 | |
762 o | 2 public b-A - f54f1bb90ff3
763 |/
764 o 1 public a-B - 548a3d25dbf0
765 |
766 o 0 public a-A - 054250a37db4
767
552 $ hg pull ../mu
768 $ hg pull ../mu
553 pulling from ../mu
769 pulling from ../mu
554 searching for changes
770 searching for changes
555 no changes found
771 no changes found
556 $ hgph
772 $ hgph
557 11 1 A-secret - 435b5d83910c
773 @ 11 draft A-secret - 435b5d83910c
558 10 0 a-H - 967b449fbc94
774 |
559 9 1 a-G - 3e27b6f1eee1
775 o 10 public a-H - 967b449fbc94
560 8 0 a-F - b740e3e5c05d
776 |
561 7 0 a-E - e9f537e46dea
777 | o 9 draft a-G - 3e27b6f1eee1
562 6 0 n-B - 145e75495359
778 | |
563 5 0 n-A - d6bcb4f74035
779 | o 8 public a-F - b740e3e5c05d
564 4 0 b-A - f54f1bb90ff3
780 | |
565 3 0 a-D - b555f63b6063
781 | o 7 public a-E - e9f537e46dea
566 2 0 a-C - 54acac6f23ab
782 | |
567 1 0 a-B - 548a3d25dbf0
783 +---o 6 public n-B - 145e75495359
568 0 0 a-A - 054250a37db4
784 | |
785 o | 5 public n-A - d6bcb4f74035
786 | |
787 o | 4 public b-A - f54f1bb90ff3
788 | |
789 | o 3 public a-D - b555f63b6063
790 | |
791 | o 2 public a-C - 54acac6f23ab
792 |/
793 o 1 public a-B - 548a3d25dbf0
794 |
795 o 0 public a-A - 054250a37db4
796
569 $ cd ..
797 $ cd ..
570 Test Clone behavior
798 Test Clone behavior
571
799
@@ -577,17 +805,28 1. cloning non-publishing repository
577
805
578 $ hg clone -U mu Tau
806 $ hg clone -U mu Tau
579 $ hgph -R Tau
807 $ hgph -R Tau
580 10 1 A-secret - 435b5d83910c
808 o 10 draft A-secret - 435b5d83910c
581 9 0 a-H - 967b449fbc94
809 |
582 8 0 a-F - b740e3e5c05d
810 o 9 public a-H - 967b449fbc94
583 7 0 a-E - e9f537e46dea
811 |
584 6 0 n-B - 145e75495359
812 | o 8 public a-F - b740e3e5c05d
585 5 0 n-A - d6bcb4f74035
813 | |
586 4 0 a-D - b555f63b6063
814 | o 7 public a-E - e9f537e46dea
587 3 0 a-C - 54acac6f23ab
815 | |
588 2 0 b-A - f54f1bb90ff3
816 +---o 6 public n-B - 145e75495359
589 1 0 a-B - 548a3d25dbf0
817 | |
590 0 0 a-A - 054250a37db4
818 o | 5 public n-A - d6bcb4f74035
819 | |
820 | o 4 public a-D - b555f63b6063
821 | |
822 | o 3 public a-C - 54acac6f23ab
823 | |
824 o | 2 public b-A - f54f1bb90ff3
825 |/
826 o 1 public a-B - 548a3d25dbf0
827 |
828 o 0 public a-A - 054250a37db4
829
591
830
592 2. cloning publishing repository
831 2. cloning publishing repository
593
832
@@ -595,15 +834,27 2. cloning publishing repository
595
834
596 $ hg clone -U alpha Upsilon
835 $ hg clone -U alpha Upsilon
597 $ hgph -R Upsilon
836 $ hgph -R Upsilon
598 11 0 A-secret - 435b5d83910c
837 o 11 public A-secret - 435b5d83910c
599 10 0 a-H - 967b449fbc94
838 |
600 9 0 a-G - 3e27b6f1eee1
839 o 10 public a-H - 967b449fbc94
601 8 0 a-F - b740e3e5c05d
840 |
602 7 0 a-E - e9f537e46dea
841 | o 9 public a-G - 3e27b6f1eee1
603 6 0 n-B - 145e75495359
842 | |
604 5 0 n-A - d6bcb4f74035
843 | o 8 public a-F - b740e3e5c05d
605 4 0 b-A - f54f1bb90ff3
844 | |
606 3 0 a-D - b555f63b6063
845 | o 7 public a-E - e9f537e46dea
607 2 0 a-C - 54acac6f23ab
846 | |
608 1 0 a-B - 548a3d25dbf0
847 +---o 6 public n-B - 145e75495359
609 0 0 a-A - 054250a37db4
848 | |
849 o | 5 public n-A - d6bcb4f74035
850 | |
851 o | 4 public b-A - f54f1bb90ff3
852 | |
853 | o 3 public a-D - b555f63b6063
854 | |
855 | o 2 public a-C - 54acac6f23ab
856 |/
857 o 1 public a-B - 548a3d25dbf0
858 |
859 o 0 public a-A - 054250a37db4
860
General Comments 0
You need to be logged in to leave comments. Login now