equal
deleted
inserted
replaced
569 | |
569 | |
570 o 2352021b3785 (9) added x to x |
570 o 2352021b3785 (9) added x to x |
571 rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
571 rewritten(parent) as 334e300d6db5 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) |
572 |
572 |
573 $ hg glog -r .^:: |
573 $ hg glog -r .^:: |
574 @ 10:334e300d6db5 added x to x |
574 hg: parse error at 4: not a prefix: end |
575 | (bm) draft |
575 [255] |
576 | o 9:2352021b3785 added x to x |
|
577 | | () public |
|
578 | o 8:502e73736632 phase-divergent update to b756eb10ea73: |
|
579 | | () public |
|
580 | o 6:b756eb10ea73 added bar to bar |
|
581 |/ () public |
|
582 o 5:3d62500c673d phase-divergent update to aa071e5554e3: |
|
583 | () public |
|
584 ~ |
|
585 |
576 |
586 Using `hg evolve` to resolve phase-divergence |
577 Using `hg evolve` to resolve phase-divergence |
587 --------------------------------------------- |
578 --------------------------------------------- |
588 |
579 |
589 $ hg evolve --phase-divergent |
580 $ hg evolve --phase-divergent |
970 2 new phase-divergent changesets |
961 2 new phase-divergent changesets |
971 |
962 |
972 $ hg glog -r 428f7900a969:: |
963 $ hg glog -r 428f7900a969:: |
973 @ 28:63ccb8ea7cae added n |
964 @ 28:63ccb8ea7cae added n |
974 | () draft |
965 | () draft |
975 * 27:f313e2b90e70 added m |
966 o 27:f313e2b90e70 added m |
976 | () draft |
967 | () draft |
977 | o 26:849cee0a874b added m and n |
968 | o 26:849cee0a874b added m and n |
978 |/ () public |
969 |/ () public |
979 o 23:428f7900a969 added g |
970 o 23:428f7900a969 added g |
980 | () public |
971 | () public |
983 $ hg evolve --all --phase-divergent |
974 $ hg evolve --all --phase-divergent |
984 recreate:[27] added m |
975 recreate:[27] added m |
985 atop:[26] added m and n |
976 atop:[26] added m and n |
986 computing new diff |
977 computing new diff |
987 committed as 870e1c3eddc3 |
978 committed as 870e1c3eddc3 |
988 1 new orphan changesets |
|
989 recreate:[28] added n |
979 recreate:[28] added n |
990 atop:[26] added m and n |
980 atop:[26] added m and n |
991 rebasing to destination parent: 428f7900a969 |
981 rebasing to destination parent: 428f7900a969 |
992 computing new diff |
982 computing new diff |
993 committed as 154b0179fb9b |
983 committed as 154b0179fb9b |
1083 2 new phase-divergent changesets |
1073 2 new phase-divergent changesets |
1084 |
1074 |
1085 $ hg glog -r 154b0179fb9b:: |
1075 $ hg glog -r 154b0179fb9b:: |
1086 @ 34:e046341aa97c added q |
1076 @ 34:e046341aa97c added q |
1087 | () draft |
1077 | () draft |
1088 | * 33:6f8c250eecff added p |
1078 | o 33:6f8c250eecff added p |
1089 |/ () draft |
1079 |/ () draft |
1090 | o 32:8a70f55b2af3 added p and q |
1080 | o 32:8a70f55b2af3 added p and q |
1091 |/ () public |
1081 |/ () public |
1092 o 31:154b0179fb9b phase-divergent update to 849cee0a874b: |
1082 o 31:154b0179fb9b phase-divergent update to 849cee0a874b: |
1093 | () public |
1083 | () public |