Mercurial > hg

comparison tests/test-phases-exchange.t @ 15956:5653f2d166ea stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
push: prevent moving phases outside of the pushed subset
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Fri, 20 Jan 2012 21:21:13 +0100
parents 249d3420ec9c
children 2a1d97630f7f
comparison
equal deleted inserted replaced
15955:5a14f48d6b9a 15956:5653f2d166ea
236 adding changesets 236 adding changesets
237 adding manifests 237 adding manifests
238 adding file changes 238 adding file changes
239 added 1 changesets with 1 changes to 1 files 239 added 1 changesets with 1 changes to 1 files
240 (run 'hg update' to get a working copy) 240 (run 'hg update' to get a working copy)
241 $ hgph 241 $ hgph # f54f1bb90ff3 stay draft, not ancestor of -r
242 o 4 public a-D - b555f63b6063 242 o 4 public a-D - b555f63b6063
243 | 243 |
244 | o 3 public b-A - f54f1bb90ff3 244 | o 3 draft b-A - f54f1bb90ff3
245 | | 245 | |
246 o | 2 public a-C - 54acac6f23ab 246 o | 2 public a-C - 54acac6f23ab
247 |/ 247 |/
248 o 1 public a-B - 548a3d25dbf0 248 o 1 public a-B - 548a3d25dbf0
249 | 249 |
260 | 260 |
261 o 5 draft n-A - d6bcb4f74035 261 o 5 draft n-A - d6bcb4f74035
262 | 262 |
263 | o 4 public a-D - b555f63b6063 263 | o 4 public a-D - b555f63b6063
264 | | 264 | |
265 o | 3 public b-A - f54f1bb90ff3 265 o | 3 draft b-A - f54f1bb90ff3
266 | | 266 | |
267 | o 2 public a-C - 54acac6f23ab 267 | o 2 public a-C - 54acac6f23ab
268 |/ 268 |/
269 o 1 public a-B - 548a3d25dbf0 269 o 1 public a-B - 548a3d25dbf0
270 | 270 |
286 | 286 |
287 | o 4 public a-D - b555f63b6063 287 | o 4 public a-D - b555f63b6063
288 | | 288 | |
289 | o 3 public a-C - 54acac6f23ab 289 | o 3 public a-C - 54acac6f23ab
290 | | 290 | |
291 o | 2 public b-A - f54f1bb90ff3 291 o | 2 draft b-A - f54f1bb90ff3
292 |/ 292 |/
293 o 1 public a-B - 548a3d25dbf0 293 o 1 public a-B - 548a3d25dbf0
294 | 294 |
295 o 0 public a-A - 054250a37db4 295 o 0 public a-A - 054250a37db4
296 296
495 | 495 |
496 o 0 public a-A - 054250a37db4 496 o 0 public a-A - 054250a37db4
497 497
498 498
499 $ cd ../mu 499 $ cd ../mu
500 $ hgph # d6bcb4f74035 and 145e75495359 changed because common is too smart 500 $ hgph # again f54f1bb90ff3, d6bcb4f74035 and 145e75495359 stay draft,
501 > # not ancestor of -r
501 o 8 draft a-F - b740e3e5c05d 502 o 8 draft a-F - b740e3e5c05d
502 | 503 |
503 o 7 draft a-E - e9f537e46dea 504 o 7 draft a-E - e9f537e46dea
504 | 505 |
505 | o 6 public n-B - 145e75495359 506 | o 6 draft n-B - 145e75495359
506 | | 507 | |
507 | o 5 public n-A - d6bcb4f74035 508 | o 5 draft n-A - d6bcb4f74035
508 | | 509 | |
509 o | 4 public a-D - b555f63b6063 510 o | 4 public a-D - b555f63b6063
510 | | 511 | |
511 o | 3 public a-C - 54acac6f23ab 512 o | 3 public a-C - 54acac6f23ab
512 | | 513 | |
513 | o 2 public b-A - f54f1bb90ff3 514 | o 2 draft b-A - f54f1bb90ff3
514 |/ 515 |/
515 o 1 public a-B - 548a3d25dbf0 516 o 1 public a-B - 548a3d25dbf0
516 | 517 |
517 o 0 public a-A - 054250a37db4 518 o 0 public a-A - 054250a37db4
518 519
524 searching for changes 525 searching for changes
525 adding changesets 526 adding changesets
526 adding manifests 527 adding manifests
527 adding file changes 528 adding file changes
528 added 2 changesets with 2 changes to 2 files 529 added 2 changesets with 2 changes to 2 files
529 $ hgph # again d6bcb4f74035 and 145e75495359 changed because common is too smart 530 $ hgph # again f54f1bb90ff3, d6bcb4f74035 and 145e75495359 stay draft,
531 > # not ancestor of -r
530 o 8 public a-F - b740e3e5c05d 532 o 8 public a-F - b740e3e5c05d
531 | 533 |
532 o 7 public a-E - e9f537e46dea 534 o 7 public a-E - e9f537e46dea
533 | 535 |
534 | o 6 public n-B - 145e75495359 536 | o 6 draft n-B - 145e75495359
535 | | 537 | |
536 | o 5 public n-A - d6bcb4f74035 538 | o 5 draft n-A - d6bcb4f74035
537 | | 539 | |
538 o | 4 public a-D - b555f63b6063 540 o | 4 public a-D - b555f63b6063
539 | | 541 | |
540 o | 3 public a-C - 54acac6f23ab 542 o | 3 public a-C - 54acac6f23ab
541 | | 543 | |
542 | o 2 public b-A - f54f1bb90ff3 544 | o 2 draft b-A - f54f1bb90ff3
543 |/ 545 |/
544 o 1 public a-B - 548a3d25dbf0 546 o 1 public a-B - 548a3d25dbf0
545 | 547 |
546 o 0 public a-A - 054250a37db4 548 o 0 public a-A - 054250a37db4
547 549
567 o 1 public a-B - 548a3d25dbf0 569 o 1 public a-B - 548a3d25dbf0
568 | 570 |
569 o 0 public a-A - 054250a37db4 571 o 0 public a-A - 054250a37db4
570 572
571 $ cd ../alpha 573 $ cd ../alpha
572 $ hgph # e9f537e46dea and b740e3e5c05d should have been sync to 0 574 $ hgph
573 @ 10 draft a-H - 967b449fbc94 575 @ 10 draft a-H - 967b449fbc94
574 | 576 |
575 | o 9 draft a-G - 3e27b6f1eee1 577 | o 9 draft a-G - 3e27b6f1eee1
576 | | 578 | |
577 | o 8 public a-F - b740e3e5c05d 579 | o 8 public a-F - b740e3e5c05d
625 | 627 |
626 o 0 public a-A - 054250a37db4 628 o 0 public a-A - 054250a37db4
627 629
628 $ cd ../mu 630 $ cd ../mu
629 $ hgph # d6bcb4f74035 should have changed phase 631 $ hgph # d6bcb4f74035 should have changed phase
630 > # again d6bcb4f74035 and 145e75495359 changed because common was too smart 632 > # 145e75495359 is still draft. not ancestor of -r
631 o 9 draft a-H - 967b449fbc94 633 o 9 draft a-H - 967b449fbc94
632 | 634 |
633 | o 8 public a-F - b740e3e5c05d 635 | o 8 public a-F - b740e3e5c05d
634 | | 636 | |
635 | o 7 public a-E - e9f537e46dea 637 | o 7 public a-E - e9f537e46dea
636 | | 638 | |
637 +---o 6 public n-B - 145e75495359 639 +---o 6 draft n-B - 145e75495359
638 | | 640 | |
639 o | 5 public n-A - d6bcb4f74035 641 o | 5 public n-A - d6bcb4f74035
640 | | 642 | |
641 | o 4 public a-D - b555f63b6063 643 | o 4 public a-D - b555f63b6063
642 | | 644 | |