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 | |
163 | |
164 o 4d1169d82e47 (1) modify a |
164 o 4d1169d82e47 (1) modify a |
165 rewritten(description) as 98bb3a6cfe1a using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
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 |
584 |
584 |
585 $ hg obslog -r . |
585 $ hg obslog -r . |
586 @ 334e300d6db5 (10) added x to x |
586 @ 334e300d6db5 (10) added x to x |
587 | |
587 | |
588 o 2352021b3785 (9) added x to x |
588 o 2352021b3785 (9) added x to x |
589 rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
589 rebased(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
590 |
590 |
591 $ hg glog -r .^:: |
591 $ hg glog -r .^:: |
592 @ 10:334e300d6db5 added x to x |
592 @ 10:334e300d6db5 added x to x |
593 | (bm) draft |
593 | (bm) draft |
594 | o 9:2352021b3785 added x to x |
594 | o 9:2352021b3785 added x to x |
632 $ hg obslog -r . b1a0e143e32b --all --hidden |
632 $ hg obslog -r . b1a0e143e32b --all --hidden |
633 x b1a0e143e32b (11) added x to x |
633 x b1a0e143e32b (11) added x to x |
634 | pruned 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) |
635 | |
635 | |
636 x 334e300d6db5 (10) added x to x |
636 x 334e300d6db5 (10) added x to x |
637 | rewritten(parent) as b1a0e143e32b using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
637 | rebased(parent) as b1a0e143e32b using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
638 | |
638 | |
639 @ 2352021b3785 (9) added x to x |
639 @ 2352021b3785 (9) added x to x |
640 rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
640 rebased(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
641 |
641 |
642 |
642 |
643 $ hg exp |
643 $ hg exp |
644 # HG changeset patch |
644 # HG changeset patch |
645 # User test |
645 # User test |
715 |
715 |
716 $ hg obslog -r . |
716 $ hg obslog -r . |
717 @ 13015a180eee (14) y to y and foobar to foo |
717 @ 13015a180eee (14) y to y and foobar to foo |
718 | |
718 | |
719 x 211ab84d1689 (13) y to y and foobar to foo |
719 x 211ab84d1689 (13) y to y and foobar to foo |
720 | rewritten(content) as 13015a180eee using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
720 | amended(content) as 13015a180eee using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
721 | |
721 | |
722 o dc88f5aa9bc9 (12) y to y and foobar to foo |
722 o dc88f5aa9bc9 (12) y to y and foobar to foo |
723 rewritten(parent) as 211ab84d1689 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
723 rebased(parent) as 211ab84d1689 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
724 |
724 |
725 Resolving divergence using `hg evolve` |
725 Resolving divergence using `hg evolve` |
726 ------------------------------------- |
726 ------------------------------------- |
727 |
727 |
728 $ hg evolve --phase-divergent --update |
728 $ hg evolve --phase-divergent --update |
787 |
787 |
788 $ hg obslog -r . |
788 $ hg obslog -r . |
789 @ 5fd38c0de46e (19) added l to l |
789 @ 5fd38c0de46e (19) added l to l |
790 | |
790 | |
791 x 2bfd56949cf0 (18) added l to l |
791 x 2bfd56949cf0 (18) added l to l |
792 | rewritten(content) as 5fd38c0de46e using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
792 | amended(content) as 5fd38c0de46e using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
793 | |
793 | |
794 x f3794e5a91dc (17) added l to l |
794 x f3794e5a91dc (17) added l to l |
795 rewritten(parent) as 2bfd56949cf0 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
795 rebased(parent) as 2bfd56949cf0 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
796 |
796 |
797 |
797 |
798 $ hg phase -r f3794e5a91dc --public --hidden |
798 $ hg phase -r f3794e5a91dc --public --hidden |
799 1 new phase-divergent changesets |
799 1 new phase-divergent changesets |
800 |
800 |
1031 | | |
1031 | | |
1032 | x ee4af146c5cf (5) added n |
1032 | x ee4af146c5cf (5) added n |
1033 | | rewritten(description, parent, content) as 89ba615ea1ec using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1033 | | rewritten(description, parent, content) as 89ba615ea1ec using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1034 | | |
1034 | | |
1035 | x e1154ec0206a (3) added n |
1035 | x e1154ec0206a (3) added n |
1036 |/ rewritten(parent) as ee4af146c5cf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1036 |/ rebased(parent) as ee4af146c5cf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1037 | |
1037 | |
1038 o a51bce62c219 (1) added m and n |
1038 o a51bce62c219 (1) added m and n |
1039 rewritten(description, parent, content) as 4f25cd9cd2bf, e1154ec0206a using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
1039 split(description, parent, content) as 4f25cd9cd2bf, e1154ec0206a using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
1040 |
1040 |
1041 |
1041 |
1042 XXX: not sure this is the correct |
1042 XXX: not sure this is the correct |
1043 $ hg exp 89ba615ea1ec |
1043 $ hg exp 89ba615ea1ec |
1044 # HG changeset patch |
1044 # HG changeset patch |
1161 | | |
1161 | | |
1162 | x bb87595f9a77 (3) added q |
1162 | x bb87595f9a77 (3) added q |
1163 |/ rewritten(description, parent, content) as 26f564f94bcc using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1163 |/ rewritten(description, parent, content) as 26f564f94bcc using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1164 | |
1164 | |
1165 o 90859808ece6 (1) added p and q |
1165 o 90859808ece6 (1) added p and q |
1166 rewritten(description, content) as a47263294745, bb87595f9a77 using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
1166 split(description, content) as a47263294745, bb87595f9a77 using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
1167 |
1167 |
1168 |
1168 |
1169 XXX: not sure this is correct |
1169 XXX: not sure this is correct |
1170 $ hg exp 26f564f94bcc |
1170 $ hg exp 26f564f94bcc |
1171 # HG changeset patch |
1171 # HG changeset patch |
1292 | | |
1292 | | |
1293 | x 98dad8812511 (6) added n |
1293 | x 98dad8812511 (6) added n |
1294 | | rewritten(description, parent, content) as 88b0dae5369a using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1294 | | rewritten(description, parent, content) as 88b0dae5369a using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1295 | | |
1295 | | |
1296 | x 52ca78bb98c7 (4) added n |
1296 | x 52ca78bb98c7 (4) added n |
1297 | | rewritten(parent) as 98dad8812511 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1297 | | rebased(parent) as 98dad8812511 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) |
1298 | | |
1298 | | |
1299 | x e1154ec0206a (3) added n |
1299 | x e1154ec0206a (3) added n |
1300 |/ rewritten(content) as 52ca78bb98c7 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
1300 |/ amended(content) as 52ca78bb98c7 using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
1301 | |
1301 | |
1302 o a51bce62c219 (1) added m and n |
1302 o a51bce62c219 (1) added m and n |
1303 rewritten(description, parent, content) as 4f25cd9cd2bf, e1154ec0206a using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
1303 split(description, parent, content) as 4f25cd9cd2bf, e1154ec0206a using prune by test (Thu Jan 01 00:00:00 1970 +0000) |
1304 |
1304 |
1305 |
1305 |
1306 XXX: not sure this is correct |
1306 XXX: not sure this is correct |
1307 $ hg exp 86419909e017 |
1307 $ hg exp 86419909e017 |
1308 # HG changeset patch |
1308 # HG changeset patch |