587 unresolved merge conflicts |
587 unresolved merge conflicts |
588 (see 'hg help evolve.interrupted') |
588 (see 'hg help evolve.interrupted') |
589 [1] |
589 [1] |
590 |
590 |
591 $ hg evolve --stop |
591 $ hg evolve --stop |
592 1 new orphan changesets |
592 2 new orphan changesets |
593 stopped the interrupted evolve |
593 stopped the interrupted evolve |
594 working directory is now at 509103439e5e |
594 working directory is now at 2a955e808c53 |
595 $ hg log -G |
595 $ hg log -G |
596 * changeset: 22:a93be2347074 |
596 o changeset: 21:74fbf3e6a0b6 |
597 | tag: tip |
597 | tag: tip |
598 | user: test |
|
599 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
600 | instability: content-divergent |
|
601 | summary: added b |
|
602 | |
|
603 o changeset: 21:74fbf3e6a0b6 |
|
604 | parent: 9:2228e3b74514 |
598 | parent: 9:2228e3b74514 |
605 | user: test |
599 | user: test |
606 | date: Thu Jan 01 00:00:00 1970 +0000 |
600 | date: Thu Jan 01 00:00:00 1970 +0000 |
607 | summary: watbar to a |
601 | summary: watbar to a |
608 | |
602 | |
616 | | user: test |
610 | | user: test |
617 | | date: Thu Jan 01 00:00:00 1970 +0000 |
611 | | date: Thu Jan 01 00:00:00 1970 +0000 |
618 | | instability: orphan, content-divergent |
612 | | instability: orphan, content-divergent |
619 | | summary: added c |
613 | | summary: added c |
620 | | |
614 | | |
621 | @ changeset: 17:509103439e5e |
615 | * changeset: 17:509103439e5e |
622 | | parent: 5:8e222f257bbf |
616 | | parent: 5:8e222f257bbf |
623 | | user: test |
617 | | user: test |
624 | | date: Thu Jan 01 00:00:00 1970 +0000 |
618 | | date: Thu Jan 01 00:00:00 1970 +0000 |
625 | | instability: orphan, content-divergent |
619 | | instability: orphan, content-divergent |
626 | | summary: added b |
620 | | summary: added b |
635 | | | user: test |
629 | | | user: test |
636 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
630 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
637 | | | instability: orphan, content-divergent |
631 | | | instability: orphan, content-divergent |
638 | | | summary: added c |
632 | | | summary: added c |
639 | | | |
633 | | | |
640 | | x changeset: 14:2a955e808c53 |
634 | | @ changeset: 14:2a955e808c53 |
641 | | | parent: 10:c04ff147ef79 |
635 | | | parent: 10:c04ff147ef79 |
642 | | | user: test |
636 | | | user: test |
643 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
637 | | | date: Thu Jan 01 00:00:00 1970 +0000 |
644 | | | obsolete: rebased using evolve as 22:a93be2347074 |
638 | | | instability: orphan, content-divergent |
645 | | | summary: added b |
639 | | | summary: added b |
646 | | | |
640 | | | |
647 +---x changeset: 10:c04ff147ef79 |
641 +---x changeset: 10:c04ff147ef79 |
648 | | user: test |
642 | | user: test |
649 | | date: Thu Jan 01 00:00:00 1970 +0000 |
643 | | date: Thu Jan 01 00:00:00 1970 +0000 |
683 x c7586e2a9264 (1) added a |
677 x c7586e2a9264 (1) added a |
684 rewritten(description, content) as 8e222f257bbf using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
678 rewritten(description, content) as 8e222f257bbf using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
685 rewritten(parent) as c04ff147ef79 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
679 rewritten(parent) as c04ff147ef79 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
686 |
680 |
687 $ hg obslog -r 'desc("added b")' --all |
681 $ hg obslog -r 'desc("added b")' --all |
688 @ 509103439e5e (17) added b |
682 @ 2a955e808c53 (14) added b |
689 | |
683 | |
690 | * a93be2347074 (22) added b |
684 | * 509103439e5e (17) added b |
691 | | |
685 | | |
692 | x 2a955e808c53 (14) added b |
686 x | 6eb54b5af3fb (11) added b |
693 | | rewritten(parent) as a93be2347074 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
687 | | rewritten(content) as 2a955e808c53 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
694 | | |
688 | | |
695 x | d5f148423c16 (6) added b |
689 | x d5f148423c16 (6) added b |
696 | | rewritten(content) as 509103439e5e using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
690 |/ rewritten(content) as 509103439e5e using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
697 | | |
|
698 | x 6eb54b5af3fb (11) added b |
|
699 |/ rewritten(content) as 2a955e808c53 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
|
700 | |
691 | |
701 x b1661037fa25 (2) added b |
692 x b1661037fa25 (2) added b |
702 rewritten(parent) as 6eb54b5af3fb using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
693 rewritten(parent) as 6eb54b5af3fb using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
703 rewritten(parent) as d5f148423c16 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
694 rewritten(parent) as d5f148423c16 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
704 |
695 |
705 |
696 |
706 Again, let's evolve the stack |
697 Again, let's evolve the stack |
707 $ hg evolve --content-divergent |
698 $ hg evolve --content-divergent |
708 skipping 48b0f803817a: have a different parent than eaf34afe4df3 (not handled yet) |
699 merge:[14] added b |
709 | 48b0f803817a, eaf34afe4df3 are not based on the same changeset. |
|
710 | With the current state of its implementation, |
|
711 | evolve does not work in that case. |
|
712 | rebase one of them next to the other and run |
|
713 | this command again. |
|
714 | - either: hg rebase --dest 'p1(48b0f803817a)' -r eaf34afe4df3 |
|
715 | - or: hg rebase --dest 'p1(eaf34afe4df3)' -r 48b0f803817a |
|
716 merge:[22] added b |
|
717 with: [17] added b |
700 with: [17] added b |
718 base: [2] added b |
701 base: [2] added b |
|
702 rebasing "divergent" content-divergent changeset 2a955e808c53 on 74fbf3e6a0b6 |
719 rebasing "other" content-divergent changeset 509103439e5e on 74fbf3e6a0b6 |
703 rebasing "other" content-divergent changeset 509103439e5e on 74fbf3e6a0b6 |
720 merging b |
704 merging b |
721 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
705 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
722 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
706 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
723 unresolved merge conflicts |
707 unresolved merge conflicts |
727 $ echo foo > b |
711 $ echo foo > b |
728 $ hg res -m |
712 $ hg res -m |
729 (no more unresolved files) |
713 (no more unresolved files) |
730 continue: hg evolve --continue |
714 continue: hg evolve --continue |
731 $ hg evolve --continue |
715 $ hg evolve --continue |
732 skipping 91c8ccb9c241: have a different parent than c351be27f199 (not handled yet) |
716 merge:[15] added c |
733 | 91c8ccb9c241, c351be27f199 are not based on the same changeset. |
717 with: [18] added c |
734 | With the current state of its implementation, |
718 base: [3] added c |
735 | evolve does not work in that case. |
719 rebasing "divergent" content-divergent changeset 48b0f803817a on 4e29776e83a5 |
736 | rebase one of them next to the other and run |
720 rebasing "other" content-divergent changeset eaf34afe4df3 on 4e29776e83a5 |
737 | this command again. |
721 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
738 | - either: hg rebase --dest 'p1(91c8ccb9c241)' -r c351be27f199 |
722 merge:[16] added d |
739 | - or: hg rebase --dest 'p1(c351be27f199)' -r 91c8ccb9c241 |
723 with: [19] added d |
|
724 base: [4] added d |
|
725 rebasing "divergent" content-divergent changeset 91c8ccb9c241 on 77126af93a25 |
|
726 rebasing "other" content-divergent changeset c351be27f199 on 77126af93a25 |
|
727 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
740 working directory is now at 4e29776e83a5 |
728 working directory is now at 4e29776e83a5 |
741 |
729 |
742 $ hg evolve -l |
730 $ hg evolve -l |
743 48b0f803817a: added c |
|
744 orphan: 2a955e808c53 (obsolete parent) |
|
745 content-divergent: eaf34afe4df3 (draft) (precursor ca1b80f7960a) |
|
746 |
|
747 91c8ccb9c241: added d |
|
748 orphan: 48b0f803817a (orphan parent) |
|
749 content-divergent: c351be27f199 (draft) (precursor c41c793e0ef1) |
|
750 |
|
751 eaf34afe4df3: added c |
|
752 orphan: 509103439e5e (obsolete parent) |
|
753 content-divergent: 48b0f803817a (draft) (precursor ca1b80f7960a) |
|
754 |
|
755 c351be27f199: added d |
|
756 orphan: eaf34afe4df3 (orphan parent) |
|
757 content-divergent: 91c8ccb9c241 (draft) (precursor c41c793e0ef1) |
|
758 |
|
759 |
731 |
760 $ cd .. |
732 $ cd .. |
761 |
733 |
762 Make sure that content-divergent resolution doesn't undo a change (issue6203) |
734 Make sure that content-divergent resolution doesn't undo a change (issue6203) |
763 ----------------------------------------------------------------------------- |
735 ----------------------------------------------------------------------------- |