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