Mercurial > evolve
comparison tests/test-evolve-orphan-merge.t @ 4985:2371d40f0878
tests: update now that merge.graft() doesn't set two equal parents
This is a consequence of https://phab.mercurial-scm.org/D7549.
CORE-TEST-OUTPUT-UPDATE: 32d11a23c9cf
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 05 Dec 2019 10:04:52 -0800 |
| parents | 4101fab78314 |
| children | 7fa4bb23a78a |
comparison
equal
deleted
inserted
replaced
| 4983:6d40e0166522 | 4985:2371d40f0878 |
|---|---|
| 519 point where the other parent of merge is the first non-pruned ancestor. | 519 point where the other parent of merge is the first non-pruned ancestor. |
| 520 | 520 |
| 521 $ hg evolve -r . | 521 $ hg evolve -r . |
| 522 move:[28] merged l and x | 522 move:[28] merged l and x |
| 523 atop:[0] added hgignore | 523 atop:[0] added hgignore |
| 524 working directory is now at b61ba77b924a | 524 evolution of 28:fb8fe870ae7d created no changes to commit |
| 525 | 525 working directory is now at 8fa14d15e168 |
| 526 $ hg glog | 526 |
| 527 @ 29:b61ba77b924a merged l and x | 527 $ hg glog |
| 528 | () draft | 528 @ 0:8fa14d15e168 added hgignore |
| 529 o 0:8fa14d15e168 added hgignore | |
| 530 () draft | 529 () draft |
| 531 | 530 |
| 532 7) When one parent is pruned without successor and has no parent | 531 7) When one parent is pruned without successor and has no parent |
| 533 ---------------------------------------------------------------- | 532 ---------------------------------------------------------------- |
| 534 | 533 |
| 535 $ hg prune -r . | |
| 536 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 537 working directory is now at 8fa14d15e168 | |
| 538 1 changesets pruned | |
| 539 $ hg up null | 534 $ hg up null |
| 540 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 535 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 541 | 536 |
| 542 $ echo foo > foo | 537 $ echo foo > foo |
| 543 $ hg add foo | 538 $ hg add foo |
| 547 $ hg merge | 542 $ hg merge |
| 548 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 543 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 549 (branch merge, don't forget to commit) | 544 (branch merge, don't forget to commit) |
| 550 $ hg ci -m "merge commit" | 545 $ hg ci -m "merge commit" |
| 551 $ hg glog | 546 $ hg glog |
| 552 @ 31:32beb84b9dbc merge commit | 547 @ 30:32beb84b9dbc merge commit |
| 553 |\ () draft | 548 |\ () draft |
| 554 | o 30:f3ba8b99bb6f added foo | 549 | o 29:f3ba8b99bb6f added foo |
| 555 | () draft | 550 | () draft |
| 556 o 0:8fa14d15e168 added hgignore | 551 o 0:8fa14d15e168 added hgignore |
| 557 () draft | 552 () draft |
| 558 | 553 |
| 559 $ hg prune -r f3ba8b99bb6f | 554 $ hg prune -r f3ba8b99bb6f |
| 560 1 changesets pruned | 555 1 changesets pruned |
| 561 1 new orphan changesets | 556 1 new orphan changesets |
| 562 | 557 |
| 563 $ hg glog | 558 $ hg glog |
| 564 @ 31:32beb84b9dbc merge commit | 559 @ 30:32beb84b9dbc merge commit |
| 565 |\ () draft | 560 |\ () draft |
| 566 | x 30:f3ba8b99bb6f added foo | 561 | x 29:f3ba8b99bb6f added foo |
| 567 | () draft | 562 | () draft |
| 568 o 0:8fa14d15e168 added hgignore | 563 o 0:8fa14d15e168 added hgignore |
| 569 () draft | 564 () draft |
| 570 | 565 |
| 571 The current behavior seems to be the correct behavior in the above case. This is | 566 The current behavior seems to be the correct behavior in the above case. This is |
| 579 | 574 |
| 580 becomes redundant as the changeset is pruned without successor and we should | 575 becomes redundant as the changeset is pruned without successor and we should |
| 581 just remove that chain. | 576 just remove that chain. |
| 582 | 577 |
| 583 $ hg evolve -r . | 578 $ hg evolve -r . |
| 584 move:[31] merge commit | 579 move:[30] merge commit |
| 585 atop:[-1] | 580 atop:[-1] |
| 586 working directory is now at d2a03dd8c951 | 581 working directory is now at d2a03dd8c951 |
| 587 | 582 |
| 588 $ hg glog | 583 $ hg glog |
| 589 @ 32:d2a03dd8c951 merge commit | 584 @ 31:d2a03dd8c951 merge commit |
| 590 | () draft | 585 | () draft |
| 591 o 0:8fa14d15e168 added hgignore | 586 o 0:8fa14d15e168 added hgignore |
| 592 () draft | 587 () draft |