158 ------------------------------------------ |
158 ------------------------------------------ |
159 |
159 |
160 XXX: There must be mention of phase-divergence here |
160 XXX: There must be mention of phase-divergence here |
161 $ hg obslog -r . --all |
161 $ hg obslog -r . --all |
162 @ 98bb3a6cfe1a (2) tweak a |
162 @ 98bb3a6cfe1a (2) tweak a |
|
163 | reworded(description) from 4d1169d82e47 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
163 | |
164 | |
164 o 4d1169d82e47 (1) modify a |
165 o 4d1169d82e47 (1) modify a |
165 reworded(description) as 98bb3a6cfe1a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
|
166 |
166 |
167 Solving the phase divergence using evolve command |
167 Solving the phase divergence using evolve command |
168 -------------------------------------------------- |
168 -------------------------------------------------- |
169 |
169 |
170 (We do not solve evolution other than orphan by default because it turned out |
170 (We do not solve evolution other than orphan by default because it turned out |
350 o 1:4d1169d82e47 modify a |
350 o 1:4d1169d82e47 modify a |
351 | () public |
351 | () public |
352 o 0:d3873e73d99e init |
352 o 0:d3873e73d99e init |
353 () public |
353 () public |
354 |
354 |
|
355 $ hg debugobsolete |
|
356 4d1169d82e47b11570c7f380790da5f89f7cabc2 98bb3a6cfe1a3d98d0959e9d42322f38313a08f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
|
357 98bb3a6cfe1a3d98d0959e9d42322f38313a08f3 0 {d3873e73d99ef67873dac33fbcc66268d5d2b6f4} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
|
358 aa071e5554e36080a36cfd24accd5a71e3320f1e d47f2b37ed8216234c503b3a2657989958754a59 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} |
|
359 d47f2b37ed8216234c503b3a2657989958754a59 3d62500c673dd1c88bb09a73e86d0210aed6fcb6 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} |
355 $ hg obslog -r . --all |
360 $ hg obslog -r . --all |
356 @ 3d62500c673d (5) phase-divergent update to aa071e5554e3: |
361 @ 3d62500c673d (5) phase-divergent update to aa071e5554e3: |
|
362 | rewritten(description, parent, content) from d47f2b37ed82 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
357 | |
363 | |
358 x d47f2b37ed82 (4) added bar to foo |
364 x d47f2b37ed82 (4) added bar to foo |
359 | rewritten(description, parent, content) as 3d62500c673d using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
365 | rewritten(description, content) from aa071e5554e3 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
360 | |
366 | |
361 o aa071e5554e3 (3) added foo to foo |
367 o aa071e5554e3 (3) added foo to foo |
362 rewritten(description, content) as d47f2b37ed82 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
|
363 |
368 |
364 |
369 |
365 Syncing all other repositories |
370 Syncing all other repositories |
366 ------------------------------ |
371 ------------------------------ |
367 |
372 |
580 searching for changes |
585 searching for changes |
581 no changes found |
586 no changes found |
582 1 new phase-divergent changesets |
587 1 new phase-divergent changesets |
583 1 local changesets published |
588 1 local changesets published |
584 |
589 |
|
590 $ hg debugobsolete |
|
591 4d1169d82e47b11570c7f380790da5f89f7cabc2 98bb3a6cfe1a3d98d0959e9d42322f38313a08f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
|
592 98bb3a6cfe1a3d98d0959e9d42322f38313a08f3 0 {d3873e73d99ef67873dac33fbcc66268d5d2b6f4} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
|
593 aa071e5554e36080a36cfd24accd5a71e3320f1e d47f2b37ed8216234c503b3a2657989958754a59 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} |
|
594 d47f2b37ed8216234c503b3a2657989958754a59 3d62500c673dd1c88bb09a73e86d0210aed6fcb6 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} |
|
595 b756eb10ea73ee4ba69c998e64a5c6e1005d74b5 2c3560aedeadb452d517b6c5a93fd3af91b3b8cd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} |
|
596 2c3560aedeadb452d517b6c5a93fd3af91b3b8cd 502e737366322886cf628276aa0a2796904453b4 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} |
|
597 2352021b37851be226ebed109b0eb6eada918566 334e300d6db500489d842240cbdc40c203d385c7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
585 $ hg obslog -r . |
598 $ hg obslog -r . |
586 @ 334e300d6db5 (10) added x to x |
599 @ 334e300d6db5 (10) added x to x |
|
600 | rebased(parent) from 2352021b3785 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
587 | |
601 | |
588 o 2352021b3785 (9) added x to x |
602 o 2352021b3785 (9) added x to x |
589 rebased(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
|
590 |
603 |
591 $ hg glog -r .^:: |
604 $ hg glog -r .^:: |
592 @ 10:334e300d6db5 added x to x |
605 @ 10:334e300d6db5 added x to x |
593 | (bm) draft |
606 | (bm) draft |
594 | o 9:2352021b3785 added x to x |
607 | o 9:2352021b3785 added x to x |
627 o 1:4d1169d82e47 modify a |
640 o 1:4d1169d82e47 modify a |
628 | () public |
641 | () public |
629 o 0:d3873e73d99e init |
642 o 0:d3873e73d99e init |
630 () public |
643 () public |
631 |
644 |
|
645 $ hg debugobsolete |
|
646 4d1169d82e47b11570c7f380790da5f89f7cabc2 98bb3a6cfe1a3d98d0959e9d42322f38313a08f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
|
647 98bb3a6cfe1a3d98d0959e9d42322f38313a08f3 0 {d3873e73d99ef67873dac33fbcc66268d5d2b6f4} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
|
648 aa071e5554e36080a36cfd24accd5a71e3320f1e d47f2b37ed8216234c503b3a2657989958754a59 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} |
|
649 d47f2b37ed8216234c503b3a2657989958754a59 3d62500c673dd1c88bb09a73e86d0210aed6fcb6 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} |
|
650 b756eb10ea73ee4ba69c998e64a5c6e1005d74b5 2c3560aedeadb452d517b6c5a93fd3af91b3b8cd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} |
|
651 2c3560aedeadb452d517b6c5a93fd3af91b3b8cd 502e737366322886cf628276aa0a2796904453b4 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} |
|
652 2352021b37851be226ebed109b0eb6eada918566 334e300d6db500489d842240cbdc40c203d385c7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
|
653 334e300d6db500489d842240cbdc40c203d385c7 b1a0e143e32be800ff6a5c2cd6c77823652c901b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
|
654 b1a0e143e32be800ff6a5c2cd6c77823652c901b 0 {502e737366322886cf628276aa0a2796904453b4} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
632 $ hg obslog -r . b1a0e143e32b --all --hidden |
655 $ hg obslog -r . b1a0e143e32b --all --hidden |
633 x b1a0e143e32b (11) added x to x |
656 x b1a0e143e32b (11) added x to x |
|
657 | rebased(parent) from 334e300d6db5 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
634 | pruned using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
658 | pruned using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
635 | |
659 | |
636 x 334e300d6db5 (10) added x to x |
660 x 334e300d6db5 (10) added x to x |
637 | rebased(parent) as b1a0e143e32b using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
661 | rebased(parent) from 2352021b3785 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
638 | |
662 | |
639 @ 2352021b3785 (9) added x to x |
663 @ 2352021b3785 (9) added x to x |
640 rebased(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
|
641 |
664 |
642 |
665 |
643 $ hg exp |
666 $ hg exp |
644 # HG changeset patch |
667 # HG changeset patch |
645 # User test |
668 # User test |
711 o 1:4d1169d82e47 modify a |
734 o 1:4d1169d82e47 modify a |
712 | () public |
735 | () public |
713 o 0:d3873e73d99e init |
736 o 0:d3873e73d99e init |
714 () public |
737 () public |
715 |
738 |
|
739 $ hg debugobsolete |
|
740 4d1169d82e47b11570c7f380790da5f89f7cabc2 98bb3a6cfe1a3d98d0959e9d42322f38313a08f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
|
741 98bb3a6cfe1a3d98d0959e9d42322f38313a08f3 0 {d3873e73d99ef67873dac33fbcc66268d5d2b6f4} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
|
742 aa071e5554e36080a36cfd24accd5a71e3320f1e d47f2b37ed8216234c503b3a2657989958754a59 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} |
|
743 d47f2b37ed8216234c503b3a2657989958754a59 3d62500c673dd1c88bb09a73e86d0210aed6fcb6 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} |
|
744 b756eb10ea73ee4ba69c998e64a5c6e1005d74b5 2c3560aedeadb452d517b6c5a93fd3af91b3b8cd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} |
|
745 2c3560aedeadb452d517b6c5a93fd3af91b3b8cd 502e737366322886cf628276aa0a2796904453b4 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} |
|
746 2352021b37851be226ebed109b0eb6eada918566 334e300d6db500489d842240cbdc40c203d385c7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
|
747 334e300d6db500489d842240cbdc40c203d385c7 b1a0e143e32be800ff6a5c2cd6c77823652c901b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
|
748 b1a0e143e32be800ff6a5c2cd6c77823652c901b 0 {502e737366322886cf628276aa0a2796904453b4} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
|
749 dc88f5aa9bc90a6418899d267d9524205dfb429b 211ab84d1689507465ecf708fea540e9867d5fda 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
|
750 211ab84d1689507465ecf708fea540e9867d5fda 13015a180eee523ba9950f18683762a77f560f3d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
716 $ hg obslog -r . |
751 $ hg obslog -r . |
717 @ 13015a180eee (14) y to y and foobar to foo |
752 @ 13015a180eee (14) y to y and foobar to foo |
|
753 | amended(content) from 211ab84d1689 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
718 | |
754 | |
719 x 211ab84d1689 (13) y to y and foobar to foo |
755 x 211ab84d1689 (13) y to y and foobar to foo |
720 | amended(content) as 13015a180eee using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
756 | rebased(parent) from dc88f5aa9bc9 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
721 | |
757 | |
722 o dc88f5aa9bc9 (12) y to y and foobar to foo |
758 o dc88f5aa9bc9 (12) y to y and foobar to foo |
723 rebased(parent) as 211ab84d1689 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
|
724 |
759 |
725 Resolving divergence using `hg evolve` |
760 Resolving divergence using `hg evolve` |
726 ------------------------------------- |
761 ------------------------------------- |
727 |
762 |
728 $ hg evolve --phase-divergent --update |
763 $ hg evolve --phase-divergent --update |
783 $ echo kl > l |
818 $ echo kl > l |
784 $ echo foo > x |
819 $ echo foo > x |
785 $ hg add x |
820 $ hg add x |
786 $ hg amend |
821 $ hg amend |
787 |
822 |
|
823 $ hg debugobsolete |
|
824 4d1169d82e47b11570c7f380790da5f89f7cabc2 98bb3a6cfe1a3d98d0959e9d42322f38313a08f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'} |
|
825 98bb3a6cfe1a3d98d0959e9d42322f38313a08f3 0 {d3873e73d99ef67873dac33fbcc66268d5d2b6f4} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
|
826 aa071e5554e36080a36cfd24accd5a71e3320f1e d47f2b37ed8216234c503b3a2657989958754a59 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} |
|
827 d47f2b37ed8216234c503b3a2657989958754a59 3d62500c673dd1c88bb09a73e86d0210aed6fcb6 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} |
|
828 b756eb10ea73ee4ba69c998e64a5c6e1005d74b5 2c3560aedeadb452d517b6c5a93fd3af91b3b8cd 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} |
|
829 2c3560aedeadb452d517b6c5a93fd3af91b3b8cd 502e737366322886cf628276aa0a2796904453b4 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} |
|
830 2352021b37851be226ebed109b0eb6eada918566 334e300d6db500489d842240cbdc40c203d385c7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
|
831 334e300d6db500489d842240cbdc40c203d385c7 b1a0e143e32be800ff6a5c2cd6c77823652c901b 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
|
832 b1a0e143e32be800ff6a5c2cd6c77823652c901b 0 {502e737366322886cf628276aa0a2796904453b4} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'evolve', 'user': 'test'} |
|
833 dc88f5aa9bc90a6418899d267d9524205dfb429b 211ab84d1689507465ecf708fea540e9867d5fda 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
|
834 211ab84d1689507465ecf708fea540e9867d5fda 13015a180eee523ba9950f18683762a77f560f3d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
|
835 13015a180eee523ba9950f18683762a77f560f3d 7687d2968b3e2697f955beac2da24ee879950cb9 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
|
836 7687d2968b3e2697f955beac2da24ee879950cb9 8c2bb6fb44e9443c64b3a2a3d061272c8e25e6ce 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} |
|
837 f3794e5a91dc1d4d36fee5c423386b19433a1f48 2bfd56949cf0a3abfbf9881254a88fe07b336ddb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'} |
|
838 2bfd56949cf0a3abfbf9881254a88fe07b336ddb 5fd38c0de46ec31f0bb1904b5909802bc4bcb47e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
788 $ hg obslog -r . |
839 $ hg obslog -r . |
789 @ 5fd38c0de46e (19) added l to l |
840 @ 5fd38c0de46e (19) added l to l |
|
841 | amended(content) from 2bfd56949cf0 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
790 | |
842 | |
791 x 2bfd56949cf0 (18) added l to l |
843 x 2bfd56949cf0 (18) added l to l |
792 | amended(content) as 5fd38c0de46e using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
844 | rebased(parent) from f3794e5a91dc using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
793 | |
845 | |
794 x f3794e5a91dc (17) added l to l |
846 x f3794e5a91dc (17) added l to l |
795 rebased(parent) as 2bfd56949cf0 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
|
796 |
847 |
797 |
848 |
798 $ hg phase -r f3794e5a91dc --public --hidden |
849 $ hg phase -r f3794e5a91dc --public --hidden |
799 1 new phase-divergent changesets |
850 1 new phase-divergent changesets |
800 |
851 |
1019 o | 1:a51bce62c219 added m and n |
1070 o | 1:a51bce62c219 added m and n |
1020 |/ () public |
1071 |/ () public |
1021 o 0:d3873e73d99e init |
1072 o 0:d3873e73d99e init |
1022 () public |
1073 () public |
1023 |
1074 |
|
1075 $ hg debugobsolete |
|
1076 a51bce62c219f024bc0ae0cc0e3957ee77d7cb46 4f25cd9cd2bf15bc83316e91fbcb93489ea15a75 e1154ec0206ac05c3765f7bd1337e3b96db2974f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
|
1077 4f25cd9cd2bf15bc83316e91fbcb93489ea15a75 86419909e01787959aa6471aee605c6d604a3e0d 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} |
|
1078 e1154ec0206ac05c3765f7bd1337e3b96db2974f ee4af146c5cfe0b1bf7665243dd89f9bfe604f59 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
|
1079 ee4af146c5cfe0b1bf7665243dd89f9bfe604f59 89ba615ea1ec3ba5b25db9f7897eb29712d7e5d6 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} |
1024 $ hg obslog -r a51bce62c219 --all |
1080 $ hg obslog -r a51bce62c219 --all |
1025 o 86419909e017 (4) phase-divergent update to a51bce62c219: |
1081 o 86419909e017 (4) phase-divergent update to a51bce62c219: |
|
1082 | rewritten(description, parent, content) from 4f25cd9cd2bf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1026 | |
1083 | |
1027 | @ 89ba615ea1ec (6) phase-divergent update to a51bce62c219: |
1084 | @ 89ba615ea1ec (6) phase-divergent update to a51bce62c219: |
|
1085 | | rewritten(description, parent, content) from ee4af146c5cf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1028 | | |
1086 | | |
1029 x | 4f25cd9cd2bf (2) added m |
1087 x | 4f25cd9cd2bf (2) added m |
1030 | | rewritten(description, parent, content) as 86419909e017 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1088 | | split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
1031 | | |
1089 | | |
1032 | x ee4af146c5cf (5) added n |
1090 | x ee4af146c5cf (5) added n |
1033 | | rewritten(description, parent, content) as 89ba615ea1ec using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1091 | | rebased(parent) from e1154ec0206a using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1034 | | |
1092 | | |
1035 | x e1154ec0206a (3) added n |
1093 | x e1154ec0206a (3) added n |
1036 |/ rebased(parent) as ee4af146c5cf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1094 |/ split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
1037 | |
1095 | |
1038 o a51bce62c219 (1) added m and n |
1096 o a51bce62c219 (1) added m and n |
1039 split(description, parent, content) as 4f25cd9cd2bf, e1154ec0206a using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
|
1040 |
1097 |
1041 |
1098 |
1042 XXX: not sure this is the correct |
1099 XXX: not sure this is the correct |
1043 $ hg exp 89ba615ea1ec |
1100 $ hg exp 89ba615ea1ec |
1044 # HG changeset patch |
1101 # HG changeset patch |
1149 o | 1:90859808ece6 added p and q |
1206 o | 1:90859808ece6 added p and q |
1150 |/ () public |
1207 |/ () public |
1151 o 0:d3873e73d99e init |
1208 o 0:d3873e73d99e init |
1152 () public |
1209 () public |
1153 |
1210 |
|
1211 $ hg debugobsolete |
|
1212 90859808ece64c9ca64dd29992db42353c70f164 a472632947451d2e52659aec3088c98ddf920f2b bb87595f9a77d7d1e4a8726beef266a1636f63d5 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'} |
|
1213 a472632947451d2e52659aec3088c98ddf920f2b 25875a9cb6400973b846c94f6a80410067c2cb1f 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} |
|
1214 bb87595f9a77d7d1e4a8726beef266a1636f63d5 26f564f94bcc34e049eb112fd14ab1e5286f2325 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} |
1154 $ hg obslog -r 90859808ece6 --all |
1215 $ hg obslog -r 90859808ece6 --all |
1155 o 25875a9cb640 (4) phase-divergent update to 90859808ece6: |
1216 o 25875a9cb640 (4) phase-divergent update to 90859808ece6: |
|
1217 | rewritten(description, parent, content) from a47263294745 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1156 | |
1218 | |
1157 | @ 26f564f94bcc (5) phase-divergent update to 90859808ece6: |
1219 | @ 26f564f94bcc (5) phase-divergent update to 90859808ece6: |
|
1220 | | rewritten(description, parent, content) from bb87595f9a77 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1158 | | |
1221 | | |
1159 x | a47263294745 (2) added p |
1222 x | a47263294745 (2) added p |
1160 | | rewritten(description, parent, content) as 25875a9cb640 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1223 | | split(description, content) from 90859808ece6 using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
1161 | | |
1224 | | |
1162 | x bb87595f9a77 (3) added q |
1225 | x bb87595f9a77 (3) added q |
1163 |/ rewritten(description, parent, content) as 26f564f94bcc using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1226 |/ split(description, content) from 90859808ece6 using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
1164 | |
1227 | |
1165 o 90859808ece6 (1) added p and q |
1228 o 90859808ece6 (1) added p and q |
1166 split(description, content) as a47263294745, bb87595f9a77 using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
|
1167 |
1229 |
1168 |
1230 |
1169 XXX: not sure this is correct |
1231 XXX: not sure this is correct |
1170 $ hg exp 26f564f94bcc |
1232 $ hg exp 26f564f94bcc |
1171 # HG changeset patch |
1233 # HG changeset patch |
1280 o | 1:a51bce62c219 added m and n |
1342 o | 1:a51bce62c219 added m and n |
1281 |/ () public |
1343 |/ () public |
1282 o 0:d3873e73d99e init |
1344 o 0:d3873e73d99e init |
1283 () public |
1345 () public |
1284 |
1346 |
|
1347 $ hg debugobsolete |
|
1348 a51bce62c219f024bc0ae0cc0e3957ee77d7cb46 4f25cd9cd2bf15bc83316e91fbcb93489ea15a75 e1154ec0206ac05c3765f7bd1337e3b96db2974f 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'} |
|
1349 e1154ec0206ac05c3765f7bd1337e3b96db2974f 52ca78bb98c71222f8afae28d48ae6cfd44a60c9 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '8', 'operation': 'amend', 'user': 'test'} |
|
1350 4f25cd9cd2bf15bc83316e91fbcb93489ea15a75 86419909e01787959aa6471aee605c6d604a3e0d 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} |
|
1351 52ca78bb98c71222f8afae28d48ae6cfd44a60c9 98dad881251146cd171f53b2a5b7fc3a371f820e 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'} |
|
1352 98dad881251146cd171f53b2a5b7fc3a371f820e 88b0dae5369aaa3bceb6c0b647542594e2c72fb7 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} |
1285 $ hg obslog -r a51bce62c219 --all |
1353 $ hg obslog -r a51bce62c219 --all |
1286 o 86419909e017 (5) phase-divergent update to a51bce62c219: |
1354 o 86419909e017 (5) phase-divergent update to a51bce62c219: |
|
1355 | rewritten(description, parent, content) from 4f25cd9cd2bf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1287 | |
1356 | |
1288 | @ 88b0dae5369a (7) phase-divergent update to a51bce62c219: |
1357 | @ 88b0dae5369a (7) phase-divergent update to a51bce62c219: |
|
1358 | | rewritten(description, parent, content) from 98dad8812511 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1289 | | |
1359 | | |
1290 x | 4f25cd9cd2bf (2) added m |
1360 x | 4f25cd9cd2bf (2) added m |
1291 | | rewritten(description, parent, content) as 86419909e017 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1361 | | split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
1292 | | |
1362 | | |
1293 | x 98dad8812511 (6) added n |
1363 | x 98dad8812511 (6) added n |
1294 | | rewritten(description, parent, content) as 88b0dae5369a using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1364 | | rebased(parent) from 52ca78bb98c7 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1295 | | |
1365 | | |
1296 | x 52ca78bb98c7 (4) added n |
1366 | x 52ca78bb98c7 (4) added n |
1297 | | rebased(parent) as 98dad8812511 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1367 | | amended(content) from e1154ec0206a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
1298 | | |
1368 | | |
1299 | x e1154ec0206a (3) added n |
1369 | x e1154ec0206a (3) added n |
1300 |/ amended(content) as 52ca78bb98c7 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
1370 |/ split(description, parent, content) from a51bce62c219 using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
1301 | |
1371 | |
1302 o a51bce62c219 (1) added m and n |
1372 o a51bce62c219 (1) added m and n |
1303 split(description, parent, content) as 4f25cd9cd2bf, e1154ec0206a using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
|
1304 |
1373 |
1305 |
1374 |
1306 XXX: not sure this is correct |
1375 XXX: not sure this is correct |
1307 $ hg exp 86419909e017 |
1376 $ hg exp 86419909e017 |
1308 # HG changeset patch |
1377 # HG changeset patch |
1577 |
1646 |
1578 $ hg evolve --list |
1647 $ hg evolve --list |
1579 599454370881: E2 |
1648 599454370881: E2 |
1580 phase-divergent: 3074c7249d20 (immutable precursor) |
1649 phase-divergent: 3074c7249d20 (immutable precursor) |
1581 |
1650 |
|
1651 $ hg debugobsolete |
|
1652 3074c7249d2023b1fff891591d7e609695cd09c2 59945437088136c5fa2f9bb8573d5d02623fe7cb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} |
1582 $ hg obslog --all --patch |
1653 $ hg obslog --all --patch |
1583 @ 599454370881 (2) E2 |
1654 @ 599454370881 (2) E2 |
|
1655 | rewritten(description, content) from 3074c7249d20 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
|
1656 | diff -r 3074c7249d20 -r 599454370881 changeset-description |
|
1657 | --- a/changeset-description |
|
1658 | +++ b/changeset-description |
|
1659 | @@ -1,1 +1,1 @@ |
|
1660 | -E1 |
|
1661 | +E2 |
|
1662 | |
|
1663 | diff -r 3074c7249d20 -r 599454370881 letters |
|
1664 | --- a/letters Thu Jan 01 00:00:00 1970 +0000 |
|
1665 | +++ b/letters Thu Jan 01 00:00:00 1970 +0000 |
|
1666 | @@ -1,7 +1,7 @@ |
|
1667 | a |
|
1668 | b |
|
1669 | c |
|
1670 | -D |
|
1671 | +d |
|
1672 | e |
|
1673 | f |
|
1674 | g |
|
1675 | diff -r 3074c7249d20 -r 599454370881 numbers |
|
1676 | --- a/numbers Thu Jan 01 00:00:00 1970 +0000 |
|
1677 | +++ b/numbers Thu Jan 01 00:00:00 1970 +0000 |
|
1678 | @@ -1,9 +1,9 @@ |
|
1679 | 1 |
|
1680 | 2 |
|
1681 | 3 |
|
1682 | -four |
|
1683 | +4 |
|
1684 | 5 |
|
1685 | 6 |
|
1686 | -7 |
|
1687 | +seven |
|
1688 | 8 |
|
1689 | nine |
|
1690 | diff -r 3074c7249d20 -r 599454370881 romans |
|
1691 | --- a/romans Thu Jan 01 00:00:00 1970 +0000 |
|
1692 | +++ b/romans Thu Jan 01 00:00:00 1970 +0000 |
|
1693 | @@ -1,5 +1,5 @@ |
|
1694 | I |
|
1695 | -II |
|
1696 | +ii |
|
1697 | III |
|
1698 | IV |
|
1699 | V |
|
1700 | |
1584 | |
1701 | |
1585 o 3074c7249d20 (1) E1 |
1702 o 3074c7249d20 (1) E1 |
1586 rewritten(description, content) as 599454370881 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
|
1587 diff -r 3074c7249d20 -r 599454370881 changeset-description |
|
1588 --- a/changeset-description |
|
1589 +++ b/changeset-description |
|
1590 @@ -1,1 +1,1 @@ |
|
1591 -E1 |
|
1592 +E2 |
|
1593 |
|
1594 diff -r 3074c7249d20 -r 599454370881 letters |
|
1595 --- a/letters Thu Jan 01 00:00:00 1970 +0000 |
|
1596 +++ b/letters Thu Jan 01 00:00:00 1970 +0000 |
|
1597 @@ -1,7 +1,7 @@ |
|
1598 a |
|
1599 b |
|
1600 c |
|
1601 -D |
|
1602 +d |
|
1603 e |
|
1604 f |
|
1605 g |
|
1606 diff -r 3074c7249d20 -r 599454370881 numbers |
|
1607 --- a/numbers Thu Jan 01 00:00:00 1970 +0000 |
|
1608 +++ b/numbers Thu Jan 01 00:00:00 1970 +0000 |
|
1609 @@ -1,9 +1,9 @@ |
|
1610 1 |
|
1611 2 |
|
1612 3 |
|
1613 -four |
|
1614 +4 |
|
1615 5 |
|
1616 6 |
|
1617 -7 |
|
1618 +seven |
|
1619 8 |
|
1620 nine |
|
1621 diff -r 3074c7249d20 -r 599454370881 romans |
|
1622 --- a/romans Thu Jan 01 00:00:00 1970 +0000 |
|
1623 +++ b/romans Thu Jan 01 00:00:00 1970 +0000 |
|
1624 @@ -1,5 +1,5 @@ |
|
1625 I |
|
1626 -II |
|
1627 +ii |
|
1628 III |
|
1629 IV |
|
1630 V |
|
1631 |
|
1632 |
1703 |
1633 |
1704 |
1634 $ hg evolve --phase-divergent --rev 'desc("E2")' |
1705 $ hg evolve --phase-divergent --rev 'desc("E2")' |
1635 recreate:[2] E2 |
1706 recreate:[2] E2 |
1636 atop:[1] E1 |
1707 atop:[1] E1 |
1761 7 |
1832 7 |
1762 8 |
1833 8 |
1763 -9 |
1834 -9 |
1764 +nine |
1835 +nine |
1765 |
1836 |
|
1837 $ hg debugobsolete |
|
1838 3074c7249d2023b1fff891591d7e609695cd09c2 59945437088136c5fa2f9bb8573d5d02623fe7cb 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'} |
|
1839 59945437088136c5fa2f9bb8573d5d02623fe7cb 9eebcb77a7e2b240cb7dce095bbe608b5de91cc8 1 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'evolve', 'user': 'test'} |
1766 $ hg obslog --patch |
1840 $ hg obslog --patch |
1767 @ 9eebcb77a7e2 (3) phase-divergent update to 3074c7249d20: |
1841 @ 9eebcb77a7e2 (3) phase-divergent update to 3074c7249d20: |
|
1842 | rewritten(description, parent, content) from 599454370881 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
|
1843 | (No patch available, changesets rebased) |
1768 | |
1844 | |
1769 x 599454370881 (2) E2 |
1845 x 599454370881 (2) E2 |
1770 | rewritten(description, parent, content) as 9eebcb77a7e2 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1846 | rewritten(description, content) from 3074c7249d20 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
1771 | (No patch available, changesets rebased) |
1847 | diff -r 3074c7249d20 -r 599454370881 changeset-description |
|
1848 | --- a/changeset-description |
|
1849 | +++ b/changeset-description |
|
1850 | @@ -1,1 +1,1 @@ |
|
1851 | -E1 |
|
1852 | +E2 |
|
1853 | |
|
1854 | diff -r 3074c7249d20 -r 599454370881 letters |
|
1855 | --- a/letters Thu Jan 01 00:00:00 1970 +0000 |
|
1856 | +++ b/letters Thu Jan 01 00:00:00 1970 +0000 |
|
1857 | @@ -1,7 +1,7 @@ |
|
1858 | a |
|
1859 | b |
|
1860 | c |
|
1861 | -D |
|
1862 | +d |
|
1863 | e |
|
1864 | f |
|
1865 | g |
|
1866 | diff -r 3074c7249d20 -r 599454370881 numbers |
|
1867 | --- a/numbers Thu Jan 01 00:00:00 1970 +0000 |
|
1868 | +++ b/numbers Thu Jan 01 00:00:00 1970 +0000 |
|
1869 | @@ -1,9 +1,9 @@ |
|
1870 | 1 |
|
1871 | 2 |
|
1872 | 3 |
|
1873 | -four |
|
1874 | +4 |
|
1875 | 5 |
|
1876 | 6 |
|
1877 | -7 |
|
1878 | +seven |
|
1879 | 8 |
|
1880 | nine |
|
1881 | diff -r 3074c7249d20 -r 599454370881 romans |
|
1882 | --- a/romans Thu Jan 01 00:00:00 1970 +0000 |
|
1883 | +++ b/romans Thu Jan 01 00:00:00 1970 +0000 |
|
1884 | @@ -1,5 +1,5 @@ |
|
1885 | I |
|
1886 | -II |
|
1887 | +ii |
|
1888 | III |
|
1889 | IV |
|
1890 | V |
|
1891 | |
1772 | |
1892 | |
1773 o 3074c7249d20 (1) E1 |
1893 o 3074c7249d20 (1) E1 |
1774 rewritten(description, content) as 599454370881 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
|
1775 diff -r 3074c7249d20 -r 599454370881 changeset-description |
|
1776 --- a/changeset-description |
|
1777 +++ b/changeset-description |
|
1778 @@ -1,1 +1,1 @@ |
|
1779 -E1 |
|
1780 +E2 |
|
1781 |
|
1782 diff -r 3074c7249d20 -r 599454370881 letters |
|
1783 --- a/letters Thu Jan 01 00:00:00 1970 +0000 |
|
1784 +++ b/letters Thu Jan 01 00:00:00 1970 +0000 |
|
1785 @@ -1,7 +1,7 @@ |
|
1786 a |
|
1787 b |
|
1788 c |
|
1789 -D |
|
1790 +d |
|
1791 e |
|
1792 f |
|
1793 g |
|
1794 diff -r 3074c7249d20 -r 599454370881 numbers |
|
1795 --- a/numbers Thu Jan 01 00:00:00 1970 +0000 |
|
1796 +++ b/numbers Thu Jan 01 00:00:00 1970 +0000 |
|
1797 @@ -1,9 +1,9 @@ |
|
1798 1 |
|
1799 2 |
|
1800 3 |
|
1801 -four |
|
1802 +4 |
|
1803 5 |
|
1804 6 |
|
1805 -7 |
|
1806 +seven |
|
1807 8 |
|
1808 nine |
|
1809 diff -r 3074c7249d20 -r 599454370881 romans |
|
1810 --- a/romans Thu Jan 01 00:00:00 1970 +0000 |
|
1811 +++ b/romans Thu Jan 01 00:00:00 1970 +0000 |
|
1812 @@ -1,5 +1,5 @@ |
|
1813 I |
|
1814 -II |
|
1815 +ii |
|
1816 III |
|
1817 IV |
|
1818 V |
|
1819 |
|
1820 |
1894 |
1821 $ cd .. |
1895 $ cd .. |
1822 |
1896 |
1823 Phase divergence with file removal cancelation |
1897 Phase divergence with file removal cancelation |
1824 ============================================== |
1898 ============================================== |