650 | | () [default] draft |
650 | | () [default] draft |
651 | o 1:33c576d20069 upstream |
651 | o 1:33c576d20069 upstream |
652 |/ () [default] draft |
652 |/ () [default] draft |
653 o 0:98a3f8f02ba7 initial |
653 o 0:98a3f8f02ba7 initial |
654 () [default] draft |
654 () [default] draft |
655 $ hg evolve --content-divergent 2>&1 | grep TypeError |
655 $ hg evolve --content-divergent |
656 TypeError: expected *, NoneType found (glob) |
656 merge:[3] divergent |
657 |
657 with: [4] divergent |
|
658 base: [2] divergent |
|
659 rebasing "other" content-divergent changeset 4cc21313ecee on 33c576d20069 |
|
660 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
661 1 new orphan changesets |
|
662 $ hg glog |
|
663 o 7:dfabf49594ff divergent |
|
664 | () [default] draft |
|
665 | * 5:88473f9137d1 child |
|
666 | | () [default] draft |
|
667 | x 4:4cc21313ecee divergent |
|
668 | | () [default] draft |
|
669 o | 1:33c576d20069 upstream |
|
670 |/ () [default] draft |
|
671 o 0:98a3f8f02ba7 initial |
|
672 () [default] draft |
|
673 |
|
674 $ hg evolve --any |
|
675 move:[5] child |
|
676 atop:[7] divergent |
|
677 $ hg glog |
|
678 o 8:6da8b7911364 child |
|
679 | () [default] draft |
|
680 o 7:dfabf49594ff divergent |
|
681 | () [default] draft |
|
682 o 1:33c576d20069 upstream |
|
683 | () [default] draft |
|
684 o 0:98a3f8f02ba7 initial |
|
685 () [default] draft |
|
686 $ hg debugobsolete |
|
687 898ddd4443b3d5520bf48f22f9411d5a0751cf2e befae61385695f1ae4b78b030ad91075b2b523ef 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
|
688 898ddd4443b3d5520bf48f22f9411d5a0751cf2e 4cc21313ecee97ce33265514a0596a192bfa6b3f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
|
689 4cc21313ecee97ce33265514a0596a192bfa6b3f bf4fe3a3afeb14c338094f41a35863921856592f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '12', 'operation': 'evolve', 'user': 'test'} |
|
690 befae61385695f1ae4b78b030ad91075b2b523ef dfabf49594ff9aa09d71ca6cc8e574e84bf0e651 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '10', 'operation': 'evolve', 'user': 'test'} |
|
691 bf4fe3a3afeb14c338094f41a35863921856592f dfabf49594ff9aa09d71ca6cc8e574e84bf0e651 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '2', 'operation': 'evolve', 'user': 'test'} |
|
692 88473f9137d12e90055d30bbb9b78dd786520870 6da8b7911364bc7f4cde60ba07e57213c6dfb14e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
|
693 $ hg obslog -r 'desc("divergent")' --all |
|
694 o dfabf49594ff (7) divergent |
|
695 |\ |
|
696 x | befae6138569 (3) divergent |
|
697 | | rewritten(meta, content) as dfabf49594ff using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
|
698 | | |
|
699 | x bf4fe3a3afeb (6) divergent |
|
700 | | meta-changed(meta) as dfabf49594ff using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
|
701 | | |
|
702 | x 4cc21313ecee (4) divergent |
|
703 |/ rewritten(parent, content) as bf4fe3a3afeb using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
|
704 | |
|
705 x 898ddd4443b3 (2) divergent |
|
706 amended(content) as 4cc21313ecee using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
|
707 rebased(parent) as befae6138569 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
|
708 |
658 $ cd .. |
709 $ cd .. |