Mercurial > evolve

comparison tests/test-evolve-orphan-merge.t @ 5896:b43aa9913d25 mercurial-5.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.3 into mercurial-5.2
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 24 Apr 2021 21:13:21 +0800
parents f804b78e9ee5
children fff5ed792d8f
comparison
equal deleted inserted replaced
5895:8accc5eb0aba 5896:b43aa9913d25
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 evolution of 28:fb8fe870ae7d created no changes to commit 524 working directory is now at b61ba77b924a
525 working directory is now at 8fa14d15e168 525
526 526 $ hg glog
527 $ hg glog 527 @ 29:b61ba77b924a merged l and x
528 @ 0:8fa14d15e168 added hgignore 528 | () draft
529 o 0:8fa14d15e168 added hgignore
529 () draft 530 () draft
530 531
531 7) When one parent is pruned without successor and has no parent 532 7) When one parent is pruned without successor and has no parent
532 ---------------------------------------------------------------- 533 ----------------------------------------------------------------
533 534
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
534 $ hg up null 539 $ hg up null
535 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 540 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
536 541
537 $ echo foo > foo 542 $ echo foo > foo
538 $ hg add foo 543 $ hg add foo
542 $ hg merge 547 $ hg merge
543 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 548 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
544 (branch merge, don't forget to commit) 549 (branch merge, don't forget to commit)
545 $ hg ci -m "merge commit" 550 $ hg ci -m "merge commit"
546 $ hg glog 551 $ hg glog
547 @ 30:32beb84b9dbc merge commit 552 @ 31:32beb84b9dbc merge commit
548 |\ () draft 553 |\ () draft
549 | o 29:f3ba8b99bb6f added foo 554 | o 30:f3ba8b99bb6f added foo
550 | () draft 555 | () draft
551 o 0:8fa14d15e168 added hgignore 556 o 0:8fa14d15e168 added hgignore
552 () draft 557 () draft
553 558
554 $ hg prune -r f3ba8b99bb6f 559 $ hg prune -r f3ba8b99bb6f
555 1 changesets pruned 560 1 changesets pruned
556 1 new orphan changesets 561 1 new orphan changesets
557 562
558 $ hg glog 563 $ hg glog
559 @ 30:32beb84b9dbc merge commit 564 @ 31:32beb84b9dbc merge commit
560 |\ () draft 565 |\ () draft
561 | x 29:f3ba8b99bb6f added foo 566 | x 30:f3ba8b99bb6f added foo
562 | () draft 567 | () draft
563 o 0:8fa14d15e168 added hgignore 568 o 0:8fa14d15e168 added hgignore
564 () draft 569 () draft
565 570
566 The current behavior seems to be the correct behavior in the above case. This is 571 The current behavior seems to be the correct behavior in the above case. This is
574 579
575 becomes redundant as the changeset is pruned without successor and we should 580 becomes redundant as the changeset is pruned without successor and we should
576 just remove that chain. 581 just remove that chain.
577 582
578 $ hg evolve -r . 583 $ hg evolve -r .
579 move:[30] merge commit 584 move:[31] merge commit
580 atop:[-1] 585 atop:[-1]
581 working directory is now at d2a03dd8c951 586 working directory is now at d2a03dd8c951
582 587
583 $ hg glog 588 $ hg glog
584 @ 31:d2a03dd8c951 merge commit 589 @ 32:d2a03dd8c951 merge commit
585 | () draft 590 | () draft
586 o 0:8fa14d15e168 added hgignore 591 o 0:8fa14d15e168 added hgignore
587 () draft 592 () draft