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 |
968 2 new phase-divergent changesets |
959 2 new phase-divergent changesets |
969 |
960 |
970 $ hg glog -r 428f7900a969:: |
961 $ hg glog -r 428f7900a969:: |
971 @ 28:63ccb8ea7cae added n |
962 @ 28:63ccb8ea7cae added n |
972 | () draft |
963 | () draft |
973 * 27:f313e2b90e70 added m |
964 o 27:f313e2b90e70 added m |
974 | () draft |
965 | () draft |
975 | o 26:849cee0a874b added m and n |
966 | o 26:849cee0a874b added m and n |
976 |/ () public |
967 |/ () public |
977 o 23:428f7900a969 added g |
968 o 23:428f7900a969 added g |
978 | () public |
969 | () public |
981 $ hg evolve --all --phase-divergent |
972 $ hg evolve --all --phase-divergent |
982 recreate:[27] added m |
973 recreate:[27] added m |
983 atop:[26] added m and n |
974 atop:[26] added m and n |
984 computing new diff |
975 computing new diff |
985 committed as 870e1c3eddc3 |
976 committed as 870e1c3eddc3 |
986 1 new orphan changesets |
|
987 recreate:[28] added n |
977 recreate:[28] added n |
988 atop:[26] added m and n |
978 atop:[26] added m and n |
989 rebasing to destination parent: 428f7900a969 |
979 rebasing to destination parent: 428f7900a969 |
990 computing new diff |
980 computing new diff |
991 committed as 154b0179fb9b |
981 committed as 154b0179fb9b |
1081 2 new phase-divergent changesets |
1071 2 new phase-divergent changesets |
1082 |
1072 |
1083 $ hg glog -r 154b0179fb9b:: |
1073 $ hg glog -r 154b0179fb9b:: |
1084 @ 34:e046341aa97c added q |
1074 @ 34:e046341aa97c added q |
1085 | () draft |
1075 | () draft |
1086 | * 33:6f8c250eecff added p |
1076 | o 33:6f8c250eecff added p |
1087 |/ () draft |
1077 |/ () draft |
1088 | o 32:8a70f55b2af3 added p and q |
1078 | o 32:8a70f55b2af3 added p and q |
1089 |/ () public |
1079 |/ () public |
1090 o 31:154b0179fb9b phase-divergent update to 849cee0a874b: |
1080 o 31:154b0179fb9b phase-divergent update to 849cee0a874b: |
1091 | () public |
1081 | () public |