##// 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 b''
2 2 > [extensions]
3 3 > graphlog=
4 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 7 $ mkcommit() {
8 8 > echo "$1" > "$1"
@@ -19,10 +19,14 b''
19 19 $ mkcommit a-C
20 20 $ mkcommit a-D
21 21 $ hgph
22 3 1 a-D - b555f63b6063
23 2 1 a-C - 54acac6f23ab
24 1 1 a-B - 548a3d25dbf0
25 0 1 a-A - 054250a37db4
22 @ 3 draft a-D - b555f63b6063
23 |
24 o 2 draft a-C - 54acac6f23ab
25 |
26 o 1 draft a-B - 548a3d25dbf0
27 |
28 o 0 draft a-A - 054250a37db4
29
26 30
27 31 $ hg init ../beta
28 32 $ hg push -r 1 ../beta
@@ -33,21 +37,30 b''
33 37 adding file changes
34 38 added 2 changesets with 2 changes to 2 files
35 39 $ hgph
36 3 1 a-D - b555f63b6063
37 2 1 a-C - 54acac6f23ab
38 1 0 a-B - 548a3d25dbf0
39 0 0 a-A - 054250a37db4
40 @ 3 draft a-D - b555f63b6063
41 |
42 o 2 draft a-C - 54acac6f23ab
43 |
44 o 1 public a-B - 548a3d25dbf0
45 |
46 o 0 public a-A - 054250a37db4
47
40 48
41 49 $ cd ../beta
42 50 $ hgph
43 1 0 a-B - 548a3d25dbf0
44 0 0 a-A - 054250a37db4
51 o 1 public a-B - 548a3d25dbf0
52 |
53 o 0 public a-A - 054250a37db4
54
45 55 $ hg up -q
46 56 $ mkcommit b-A
47 57 $ hgph
48 2 1 b-A - f54f1bb90ff3
49 1 0 a-B - 548a3d25dbf0
50 0 0 a-A - 054250a37db4
58 @ 2 draft b-A - f54f1bb90ff3
59 |
60 o 1 public a-B - 548a3d25dbf0
61 |
62 o 0 public a-A - 054250a37db4
63
51 64 $ hg pull ../alpha
52 65 pulling from ../alpha
53 66 searching for changes
@@ -57,30 +70,43 b''
57 70 added 2 changesets with 2 changes to 2 files (+1 heads)
58 71 (run 'hg heads' to see heads, 'hg merge' to merge)
59 72 $ hgph
60 4 0 a-D - b555f63b6063
61 3 0 a-C - 54acac6f23ab
62 2 1 b-A - f54f1bb90ff3
63 1 0 a-B - 548a3d25dbf0
64 0 0 a-A - 054250a37db4
73 o 4 public a-D - b555f63b6063
74 |
75 o 3 public a-C - 54acac6f23ab
76 |
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 84 pull did not updated ../alpha state.
67 85 push from alpha to beta should update phase even if nothing is transfered
68 86
69 87 $ cd ../alpha
70 88 $ hgph # not updated by remote pull
71 3 1 a-D - b555f63b6063
72 2 1 a-C - 54acac6f23ab
73 1 0 a-B - 548a3d25dbf0
74 0 0 a-A - 054250a37db4
89 @ 3 draft a-D - b555f63b6063
90 |
91 o 2 draft a-C - 54acac6f23ab
92 |
93 o 1 public a-B - 548a3d25dbf0
94 |
95 o 0 public a-A - 054250a37db4
96
75 97 $ hg push ../beta
76 98 pushing to ../beta
77 99 searching for changes
78 100 no changes found
79 101 $ hgph
80 3 0 a-D - b555f63b6063
81 2 0 a-C - 54acac6f23ab
82 1 0 a-B - 548a3d25dbf0
83 0 0 a-A - 054250a37db4
102 @ 3 public a-D - b555f63b6063
103 |
104 o 2 public a-C - 54acac6f23ab
105 |
106 o 1 public a-B - 548a3d25dbf0
107 |
108 o 0 public a-A - 054250a37db4
109
84 110
85 111 update must update phase of common changeset too
86 112
@@ -95,21 +121,31 b' update must update phase of common chang'
95 121
96 122 $ cd ../beta
97 123 $ hgph # not updated by remote pull
98 4 0 a-D - b555f63b6063
99 3 0 a-C - 54acac6f23ab
100 2 1 b-A - f54f1bb90ff3
101 1 0 a-B - 548a3d25dbf0
102 0 0 a-A - 054250a37db4
124 o 4 public a-D - b555f63b6063
125 |
126 o 3 public a-C - 54acac6f23ab
127 |
128 | @ 2 draft b-A - f54f1bb90ff3
129 |/
130 o 1 public a-B - 548a3d25dbf0
131 |
132 o 0 public a-A - 054250a37db4
133
103 134 $ hg pull ../alpha
104 135 pulling from ../alpha
105 136 searching for changes
106 137 no changes found
107 138 $ hgph
108 4 0 a-D - b555f63b6063
109 3 0 a-C - 54acac6f23ab
110 2 0 b-A - f54f1bb90ff3
111 1 0 a-B - 548a3d25dbf0
112 0 0 a-A - 054250a37db4
139 o 4 public a-D - b555f63b6063
140 |
141 o 3 public a-C - 54acac6f23ab
142 |
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 150 Publish configuration option
115 151 ----------------------------
@@ -135,11 +171,16 b' changegroup are added without phase move'
135 171 added 5 changesets with 5 changes to 5 files (+1 heads)
136 172 (run 'hg heads' to see heads, 'hg merge' to merge)
137 173 $ hgph
138 4 1 a-D - b555f63b6063
139 3 1 a-C - 54acac6f23ab
140 2 1 b-A - f54f1bb90ff3
141 1 1 a-B - 548a3d25dbf0
142 0 1 a-A - 054250a37db4
174 o 4 draft a-D - b555f63b6063
175 |
176 o 3 draft a-C - 54acac6f23ab
177 |
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 184 $ cd ..
144 185
145 186 Pulling from publish=False to publish=False does not move boundary.
@@ -158,9 +199,12 b' Pulling from publish=False to publish=Fa'
158 199 added 3 changesets with 3 changes to 3 files
159 200 (run 'hg update' to get a working copy)
160 201 $ hgph
161 2 1 a-C - 54acac6f23ab
162 1 1 a-B - 548a3d25dbf0
163 0 1 a-A - 054250a37db4
202 o 2 draft a-C - 54acac6f23ab
203 |
204 o 1 draft a-B - 548a3d25dbf0
205 |
206 o 0 draft a-A - 054250a37db4
207
164 208
165 209 Even for common
166 210
@@ -173,10 +217,14 b' Even for common'
173 217 added 1 changesets with 1 changes to 1 files (+1 heads)
174 218 (run 'hg heads' to see heads, 'hg merge' to merge)
175 219 $ hgph
176 3 1 b-A - f54f1bb90ff3
177 2 1 a-C - 54acac6f23ab
178 1 1 a-B - 548a3d25dbf0
179 0 1 a-A - 054250a37db4
220 o 3 draft b-A - f54f1bb90ff3
221 |
222 | o 2 draft a-C - 54acac6f23ab
223 |/
224 o 1 draft a-B - 548a3d25dbf0
225 |
226 o 0 draft a-A - 054250a37db4
227
180 228
181 229
182 230 Pulling from Publish=True to Publish=False move boundary in common set.
@@ -191,11 +239,16 b' we are in nu'
191 239 added 1 changesets with 1 changes to 1 files
192 240 (run 'hg update' to get a working copy)
193 241 $ hgph
194 4 0 a-D - b555f63b6063
195 3 0 b-A - f54f1bb90ff3
196 2 0 a-C - 54acac6f23ab
197 1 0 a-B - 548a3d25dbf0
198 0 0 a-A - 054250a37db4
242 o 4 public a-D - b555f63b6063
243 |
244 | o 3 public b-A - f54f1bb90ff3
245 | |
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 253 pulling from Publish=False to publish=False with some public
201 254
@@ -203,13 +256,20 b' pulling from Publish=False to publish=Fa'
203 256 $ mkcommit n-A
204 257 $ mkcommit n-B
205 258 $ hgph
206 6 1 n-B - 145e75495359
207 5 1 n-A - d6bcb4f74035
208 4 0 a-D - b555f63b6063
209 3 0 b-A - f54f1bb90ff3
210 2 0 a-C - 54acac6f23ab
211 1 0 a-B - 548a3d25dbf0
212 0 0 a-A - 054250a37db4
259 @ 6 draft n-B - 145e75495359
260 |
261 o 5 draft n-A - d6bcb4f74035
262 |
263 | o 4 public a-D - b555f63b6063
264 | |
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 273 $ cd ../mu
214 274 $ hg pull ../nu
215 275 pulling from ../nu
@@ -220,24 +280,36 b' pulling from Publish=False to publish=Fa'
220 280 added 2 changesets with 2 changes to 2 files
221 281 (run 'hg update' to get a working copy)
222 282 $ hgph
223 6 1 n-B - 145e75495359
224 5 1 n-A - d6bcb4f74035
225 4 0 a-D - b555f63b6063
226 3 0 a-C - 54acac6f23ab
227 2 0 b-A - f54f1bb90ff3
228 1 0 a-B - 548a3d25dbf0
229 0 0 a-A - 054250a37db4
283 o 6 draft n-B - 145e75495359
284 |
285 o 5 draft n-A - d6bcb4f74035
286 |
287 | o 4 public a-D - b555f63b6063
288 | |
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 297 $ cd ..
231 298
232 299 pulling into publish=True
233 300
234 301 $ cd alpha
235 302 $ hgph
236 4 0 b-A - f54f1bb90ff3
237 3 0 a-D - b555f63b6063
238 2 0 a-C - 54acac6f23ab
239 1 0 a-B - 548a3d25dbf0
240 0 0 a-A - 054250a37db4
303 o 4 public b-A - f54f1bb90ff3
304 |
305 | @ 3 public a-D - b555f63b6063
306 | |
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 313 $ hg pull ../mu
242 314 pulling from ../mu
243 315 searching for changes
@@ -247,13 +319,20 b' pulling into publish=True'
247 319 added 2 changesets with 2 changes to 2 files
248 320 (run 'hg update' to get a working copy)
249 321 $ hgph
250 6 1 n-B - 145e75495359
251 5 1 n-A - d6bcb4f74035
252 4 0 b-A - f54f1bb90ff3
253 3 0 a-D - b555f63b6063
254 2 0 a-C - 54acac6f23ab
255 1 0 a-B - 548a3d25dbf0
256 0 0 a-A - 054250a37db4
322 o 6 draft n-B - 145e75495359
323 |
324 o 5 draft n-A - d6bcb4f74035
325 |
326 o 4 public b-A - f54f1bb90ff3
327 |
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 336 $ cd ..
258 337
259 338 pulling back into original repo
@@ -264,13 +343,20 b' pulling back into original repo'
264 343 searching for changes
265 344 no changes found
266 345 $ hgph
267 6 0 n-B - 145e75495359
268 5 0 n-A - d6bcb4f74035
269 4 0 a-D - b555f63b6063
270 3 0 b-A - f54f1bb90ff3
271 2 0 a-C - 54acac6f23ab
272 1 0 a-B - 548a3d25dbf0
273 0 0 a-A - 054250a37db4
346 @ 6 public n-B - 145e75495359
347 |
348 o 5 public n-A - d6bcb4f74035
349 |
350 | o 4 public a-D - b555f63b6063
351 | |
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 361 Push
276 362 ````
@@ -289,13 +375,20 b' Push back to alpha'
289 375 $ cd ..
290 376 $ cd alpha
291 377 $ hgph
292 6 0 n-B - 145e75495359
293 5 0 n-A - d6bcb4f74035
294 4 0 b-A - f54f1bb90ff3
295 3 0 a-D - b555f63b6063
296 2 0 a-C - 54acac6f23ab
297 1 0 a-B - 548a3d25dbf0
298 0 0 a-A - 054250a37db4
378 o 6 public n-B - 145e75495359
379 |
380 o 5 public n-A - d6bcb4f74035
381 |
382 o 4 public b-A - f54f1bb90ff3
383 |
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 393 (end insertion)
301 394
@@ -347,17 +440,28 b' initial setup'
347 440 $ mkcommit a-H
348 441 created new head
349 442 $ hgph
350 10 1 a-H - 967b449fbc94
351 9 1 a-G - 3e27b6f1eee1
352 8 1 a-F - b740e3e5c05d
353 7 1 a-E - e9f537e46dea
354 6 0 n-B - 145e75495359
355 5 0 n-A - d6bcb4f74035
356 4 0 b-A - f54f1bb90ff3
357 3 0 a-D - b555f63b6063
358 2 0 a-C - 54acac6f23ab
359 1 0 a-B - 548a3d25dbf0
360 0 0 a-A - 054250a37db4
443 @ 10 draft a-H - 967b449fbc94
444 |
445 | o 9 draft a-G - 3e27b6f1eee1
446 | |
447 | o 8 draft a-F - b740e3e5c05d
448 | |
449 | o 7 draft a-E - e9f537e46dea
450 | |
451 +---o 6 public n-B - 145e75495359
452 | |
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 466 Pushing to Publish=False (unknown changeset)
363 467
@@ -369,29 +473,49 b' Pushing to Publish=False (unknown change'
369 473 adding file changes
370 474 added 2 changesets with 2 changes to 2 files
371 475 $ hgph
372 10 1 a-H - 967b449fbc94
373 9 1 a-G - 3e27b6f1eee1
374 8 1 a-F - b740e3e5c05d
375 7 1 a-E - e9f537e46dea
376 6 0 n-B - 145e75495359
377 5 0 n-A - d6bcb4f74035
378 4 0 b-A - f54f1bb90ff3
379 3 0 a-D - b555f63b6063
380 2 0 a-C - 54acac6f23ab
381 1 0 a-B - 548a3d25dbf0
382 0 0 a-A - 054250a37db4
476 @ 10 draft a-H - 967b449fbc94
477 |
478 | o 9 draft a-G - 3e27b6f1eee1
479 | |
480 | o 8 draft a-F - b740e3e5c05d
481 | |
482 | o 7 draft a-E - e9f537e46dea
483 | |
484 +---o 6 public n-B - 145e75495359
485 | |
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 499 $ cd ../mu
385 500 $ hgph # d6bcb4f74035 and 145e75495359 changed because common is too smart
386 8 1 a-F - b740e3e5c05d
387 7 1 a-E - e9f537e46dea
388 6 0 n-B - 145e75495359
389 5 0 n-A - d6bcb4f74035
390 4 0 a-D - b555f63b6063
391 3 0 a-C - 54acac6f23ab
392 2 0 b-A - f54f1bb90ff3
393 1 0 a-B - 548a3d25dbf0
394 0 0 a-A - 054250a37db4
501 o 8 draft a-F - b740e3e5c05d
502 |
503 o 7 draft a-E - e9f537e46dea
504 |
505 | o 6 public n-B - 145e75495359
506 | |
507 | o 5 public n-A - d6bcb4f74035
508 | |
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 520 Pushing to Publish=True (unknown changeset)
397 521
@@ -403,15 +527,24 b' Pushing to Publish=True (unknown changes'
403 527 adding file changes
404 528 added 2 changesets with 2 changes to 2 files
405 529 $ hgph # again d6bcb4f74035 and 145e75495359 changed because common is too smart
406 8 0 a-F - b740e3e5c05d
407 7 0 a-E - e9f537e46dea
408 6 0 n-B - 145e75495359
409 5 0 n-A - d6bcb4f74035
410 4 0 a-D - b555f63b6063
411 3 0 a-C - 54acac6f23ab
412 2 0 b-A - f54f1bb90ff3
413 1 0 a-B - 548a3d25dbf0
414 0 0 a-A - 054250a37db4
530 o 8 public a-F - b740e3e5c05d
531 |
532 o 7 public a-E - e9f537e46dea
533 |
534 | o 6 public n-B - 145e75495359
535 | |
536 | o 5 public n-A - d6bcb4f74035
537 | |
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 549 Pushing to Publish=True (common changeset)
417 550
@@ -421,26 +554,44 b' Pushing to Publish=True (common changese'
421 554 searching for changes
422 555 no changes found
423 556 $ hgph
424 6 0 a-F - b740e3e5c05d
425 5 0 a-E - e9f537e46dea
426 4 0 a-D - b555f63b6063
427 3 0 a-C - 54acac6f23ab
428 2 0 b-A - f54f1bb90ff3
429 1 0 a-B - 548a3d25dbf0
430 0 0 a-A - 054250a37db4
557 o 6 public a-F - b740e3e5c05d
558 |
559 o 5 public a-E - e9f537e46dea
560 |
561 o 4 public a-D - b555f63b6063
562 |
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 571 $ cd ../alpha
432 572 $ hgph # e9f537e46dea and b740e3e5c05d should have been sync to 0
433 10 1 a-H - 967b449fbc94
434 9 1 a-G - 3e27b6f1eee1
435 8 0 a-F - b740e3e5c05d
436 7 0 a-E - e9f537e46dea
437 6 0 n-B - 145e75495359
438 5 0 n-A - d6bcb4f74035
439 4 0 b-A - f54f1bb90ff3
440 3 0 a-D - b555f63b6063
441 2 0 a-C - 54acac6f23ab
442 1 0 a-B - 548a3d25dbf0
443 0 0 a-A - 054250a37db4
573 @ 10 draft a-H - 967b449fbc94
574 |
575 | o 9 draft a-G - 3e27b6f1eee1
576 | |
577 | o 8 public a-F - b740e3e5c05d
578 | |
579 | o 7 public a-E - e9f537e46dea
580 | |
581 +---o 6 public n-B - 145e75495359
582 | |
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 596 Pushing to Publish=False (common changeset that change phase + unknown one)
446 597
@@ -452,30 +603,51 b' Pushing to Publish=False (common changes'
452 603 adding file changes
453 604 added 1 changesets with 1 changes to 1 files (+1 heads)
454 605 $ hgph
455 10 1 a-H - 967b449fbc94
456 9 1 a-G - 3e27b6f1eee1
457 8 0 a-F - b740e3e5c05d
458 7 0 a-E - e9f537e46dea
459 6 0 n-B - 145e75495359
460 5 0 n-A - d6bcb4f74035
461 4 0 b-A - f54f1bb90ff3
462 3 0 a-D - b555f63b6063
463 2 0 a-C - 54acac6f23ab
464 1 0 a-B - 548a3d25dbf0
465 0 0 a-A - 054250a37db4
606 @ 10 draft a-H - 967b449fbc94
607 |
608 | o 9 draft a-G - 3e27b6f1eee1
609 | |
610 | o 8 public a-F - b740e3e5c05d
611 | |
612 | o 7 public a-E - e9f537e46dea
613 | |
614 +---o 6 public n-B - 145e75495359
615 | |
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 628 $ cd ../mu
467 629 $ hgph # d6bcb4f74035 should have changed phase
468 630 > # again d6bcb4f74035 and 145e75495359 changed because common was too smart
469 9 1 a-H - 967b449fbc94
470 8 0 a-F - b740e3e5c05d
471 7 0 a-E - e9f537e46dea
472 6 0 n-B - 145e75495359
473 5 0 n-A - d6bcb4f74035
474 4 0 a-D - b555f63b6063
475 3 0 a-C - 54acac6f23ab
476 2 0 b-A - f54f1bb90ff3
477 1 0 a-B - 548a3d25dbf0
478 0 0 a-A - 054250a37db4
631 o 9 draft a-H - 967b449fbc94
632 |
633 | o 8 public a-F - b740e3e5c05d
634 | |
635 | o 7 public a-E - e9f537e46dea
636 | |
637 +---o 6 public n-B - 145e75495359
638 | |
639 o | 5 public n-A - d6bcb4f74035
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 653 Pushing to Publish=True (common changeset from publish=False)
@@ -486,28 +658,49 b' Pushing to Publish=True (common changese'
486 658 searching for changes
487 659 no changes found
488 660 $ hgph
489 9 0 a-H - 967b449fbc94
490 8 0 a-F - b740e3e5c05d
491 7 0 a-E - e9f537e46dea
492 6 0 n-B - 145e75495359
493 5 0 n-A - d6bcb4f74035
494 4 0 a-D - b555f63b6063
495 3 0 a-C - 54acac6f23ab
496 2 0 b-A - f54f1bb90ff3
497 1 0 a-B - 548a3d25dbf0
498 0 0 a-A - 054250a37db4
661 o 9 public a-H - 967b449fbc94
662 |
663 | o 8 public a-F - b740e3e5c05d
664 | |
665 | o 7 public a-E - e9f537e46dea
666 | |
667 +---o 6 public n-B - 145e75495359
668 | |
669 o | 5 public n-A - d6bcb4f74035
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 681 $ hgph -R ../alpha # a-H should have been synced to 0
500 10 0 a-H - 967b449fbc94
501 9 1 a-G - 3e27b6f1eee1
502 8 0 a-F - b740e3e5c05d
503 7 0 a-E - e9f537e46dea
504 6 0 n-B - 145e75495359
505 5 0 n-A - d6bcb4f74035
506 4 0 b-A - f54f1bb90ff3
507 3 0 a-D - b555f63b6063
508 2 0 a-C - 54acac6f23ab
509 1 0 a-B - 548a3d25dbf0
510 0 0 a-A - 054250a37db4
682 @ 10 public a-H - 967b449fbc94
683 |
684 | o 9 draft a-G - 3e27b6f1eee1
685 | |
686 | o 8 public a-F - b740e3e5c05d
687 | |
688 | o 7 public a-E - e9f537e46dea
689 | |
690 +---o 6 public n-B - 145e75495359
691 | |
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 706 Discovery locally secret changeset on a remote repository:
@@ -517,18 +710,30 b' Discovery locally secret changeset on a '
517 710 $ cd ../alpha
518 711 $ mkcommit A-secret --config phases.new-commit=2
519 712 $ hgph
520 11 2 A-secret - 435b5d83910c
521 10 0 a-H - 967b449fbc94
522 9 1 a-G - 3e27b6f1eee1
523 8 0 a-F - b740e3e5c05d
524 7 0 a-E - e9f537e46dea
525 6 0 n-B - 145e75495359
526 5 0 n-A - d6bcb4f74035
527 4 0 b-A - f54f1bb90ff3
528 3 0 a-D - b555f63b6063
529 2 0 a-C - 54acac6f23ab
530 1 0 a-B - 548a3d25dbf0
531 0 0 a-A - 054250a37db4
713 @ 11 secret A-secret - 435b5d83910c
714 |
715 o 10 public a-H - 967b449fbc94
716 |
717 | o 9 draft a-G - 3e27b6f1eee1
718 | |
719 | o 8 public a-F - b740e3e5c05d
720 | |
721 | o 7 public a-E - e9f537e46dea
722 | |
723 +---o 6 public n-B - 145e75495359
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 737 $ hg bundle --base 'parents(.)' -r . ../secret-bundle.hg
533 738 1 changesets found
534 739 $ hg -R ../mu unbundle ../secret-bundle.hg
@@ -538,34 +743,57 b' Discovery locally secret changeset on a '
538 743 added 1 changesets with 1 changes to 1 files
539 744 (run 'hg update' to get a working copy)
540 745 $ hgph -R ../mu
541 10 1 A-secret - 435b5d83910c
542 9 0 a-H - 967b449fbc94
543 8 0 a-F - b740e3e5c05d
544 7 0 a-E - e9f537e46dea
545 6 0 n-B - 145e75495359
546 5 0 n-A - d6bcb4f74035
547 4 0 a-D - b555f63b6063
548 3 0 a-C - 54acac6f23ab
549 2 0 b-A - f54f1bb90ff3
550 1 0 a-B - 548a3d25dbf0
551 0 0 a-A - 054250a37db4
746 o 10 draft A-secret - 435b5d83910c
747 |
748 o 9 public a-H - 967b449fbc94
749 |
750 | o 8 public a-F - b740e3e5c05d
751 | |
752 | o 7 public a-E - e9f537e46dea
753 | |
754 +---o 6 public n-B - 145e75495359
755 | |
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 768 $ hg pull ../mu
553 769 pulling from ../mu
554 770 searching for changes
555 771 no changes found
556 772 $ hgph
557 11 1 A-secret - 435b5d83910c
558 10 0 a-H - 967b449fbc94
559 9 1 a-G - 3e27b6f1eee1
560 8 0 a-F - b740e3e5c05d
561 7 0 a-E - e9f537e46dea
562 6 0 n-B - 145e75495359
563 5 0 n-A - d6bcb4f74035
564 4 0 b-A - f54f1bb90ff3
565 3 0 a-D - b555f63b6063
566 2 0 a-C - 54acac6f23ab
567 1 0 a-B - 548a3d25dbf0
568 0 0 a-A - 054250a37db4
773 @ 11 draft A-secret - 435b5d83910c
774 |
775 o 10 public a-H - 967b449fbc94
776 |
777 | o 9 draft a-G - 3e27b6f1eee1
778 | |
779 | o 8 public a-F - b740e3e5c05d
780 | |
781 | o 7 public a-E - e9f537e46dea
782 | |
783 +---o 6 public n-B - 145e75495359
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 797 $ cd ..
570 798 Test Clone behavior
571 799
@@ -577,17 +805,28 b' 1. cloning non-publishing repository'
577 805
578 806 $ hg clone -U mu Tau
579 807 $ hgph -R Tau
580 10 1 A-secret - 435b5d83910c
581 9 0 a-H - 967b449fbc94
582 8 0 a-F - b740e3e5c05d
583 7 0 a-E - e9f537e46dea
584 6 0 n-B - 145e75495359
585 5 0 n-A - d6bcb4f74035
586 4 0 a-D - b555f63b6063
587 3 0 a-C - 54acac6f23ab
588 2 0 b-A - f54f1bb90ff3
589 1 0 a-B - 548a3d25dbf0
590 0 0 a-A - 054250a37db4
808 o 10 draft A-secret - 435b5d83910c
809 |
810 o 9 public a-H - 967b449fbc94
811 |
812 | o 8 public a-F - b740e3e5c05d
813 | |
814 | o 7 public a-E - e9f537e46dea
815 | |
816 +---o 6 public n-B - 145e75495359
817 | |
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 831 2. cloning publishing repository
593 832
@@ -595,15 +834,27 b' 2. cloning publishing repository'
595 834
596 835 $ hg clone -U alpha Upsilon
597 836 $ hgph -R Upsilon
598 11 0 A-secret - 435b5d83910c
599 10 0 a-H - 967b449fbc94
600 9 0 a-G - 3e27b6f1eee1
601 8 0 a-F - b740e3e5c05d
602 7 0 a-E - e9f537e46dea
603 6 0 n-B - 145e75495359
604 5 0 n-A - d6bcb4f74035
605 4 0 b-A - f54f1bb90ff3
606 3 0 a-D - b555f63b6063
607 2 0 a-C - 54acac6f23ab
608 1 0 a-B - 548a3d25dbf0
609 0 0 a-A - 054250a37db4
837 o 11 public A-secret - 435b5d83910c
838 |
839 o 10 public a-H - 967b449fbc94
840 |
841 | o 9 public a-G - 3e27b6f1eee1
842 | |
843 | o 8 public a-F - b740e3e5c05d
844 | |
845 | o 7 public a-E - e9f537e46dea
846 | |
847 +---o 6 public n-B - 145e75495359
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