Mercurial > evolve

comparison tests/test-evolve-content-divergent-interrupted.t @ 6395:1328195f76a9 mercurial-5.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.7 into mercurial-5.6
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 06 Feb 2023 19:49:33 +0400
parents c0921b5277a0 9a41c3c293ae
children 716912541759
comparison
equal deleted inserted replaced
6349:3b486ae2e79a 6395:1328195f76a9
565 $ hg amend 565 $ hg amend
566 1 new orphan changesets 566 1 new orphan changesets
567 $ hg next 567 $ hg next
568 move:[5] added d 568 move:[5] added d
569 atop:[8] added c 569 atop:[8] added c
570 working directory is now at dc9ba677cba1 570 working directory is now at 543adc7eac82
571 $ echo "latest_changes" >> a 571 $ echo "latest_changes" >> a
572 $ hg amend 572 $ hg amend
573 $ hg glog 573 $ hg glog
574 @ 10:0892835a581f added d 574 @ 10:13a3da452f7f added d
575 | () draft content-divergent 575 | () draft content-divergent
576 o 8:33c16a2e0eb8 added c 576 o 8:33c16a2e0eb8 added c
577 | () draft 577 | () draft
578 | * 7:517d4375cb72 added d 578 | * 7:517d4375cb72 added d
579 | | () draft content-divergent 579 | | () draft content-divergent
586 586
587 $ hg evolve --content-divergent 587 $ hg evolve --content-divergent
588 merge:[7] added d 588 merge:[7] added d
589 with: [10] added d 589 with: [10] added d
590 base: [4] added d 590 base: [4] added d
591 rebasing "other" content-divergent changeset 0892835a581f on c7586e2a9264 591 rebasing "other" content-divergent changeset 13a3da452f7f on c7586e2a9264
592 merging a 592 merging a
593 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 593 warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
594 unresolved merge conflicts 594 unresolved merge conflicts
595 (see 'hg help evolve.interrupted') 595 (see 'hg help evolve.interrupted')
596 [1] 596 [1]
603 foo 603 foo
604 +<<<<<<< destination: c7586e2a9264 - test: added a 604 +<<<<<<< destination: c7586e2a9264 - test: added a
605 +======= 605 +=======
606 +some_changes 606 +some_changes
607 +latest_changes 607 +latest_changes
608 +>>>>>>> evolving: 0892835a581f - test: added d 608 +>>>>>>> evolving: 13a3da452f7f - test: added d
609 diff -r c7586e2a9264 d 609 diff -r c7586e2a9264 d
610 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 610 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
611 +++ b/d Thu Jan 01 00:00:00 1970 +0000 611 +++ b/d Thu Jan 01 00:00:00 1970 +0000
612 @@ -0,0 +1,1 @@ 612 @@ -0,0 +1,1 @@
613 +bar 613 +bar
614 614
615 $ hg evolve --stop 615 $ hg evolve --stop
616 stopped the interrupted evolve 616 stopped the interrupted evolve
617 working directory is now at 0892835a581f 617 working directory is now at 13a3da452f7f
618 618
619 $ hg glog 619 $ hg glog
620 @ 10:0892835a581f added d 620 @ 10:13a3da452f7f added d
621 | () draft content-divergent 621 | () draft content-divergent
622 o 8:33c16a2e0eb8 added c 622 o 8:33c16a2e0eb8 added c
623 | () draft 623 | () draft
624 | * 7:517d4375cb72 added d 624 | * 7:517d4375cb72 added d
625 | | () draft content-divergent 625 | | () draft content-divergent