equal
deleted
inserted
replaced
995 |
995 |
996 $ hg evolve --all --phase-divergent |
996 $ hg evolve --all --phase-divergent |
997 recreate:[2] added m |
997 recreate:[2] added m |
998 atop:[1] added m and n |
998 atop:[1] added m and n |
999 committed as 86419909e017 |
999 committed as 86419909e017 |
1000 1 new orphan changesets |
|
1001 recreate:[3] added n |
1000 recreate:[3] added n |
1002 atop:[1] added m and n |
1001 atop:[1] added m and n |
1003 rebasing to destination parent: d3873e73d99e |
1002 rebasing to destination parent: d3873e73d99e |
1004 committed as 89ba615ea1ec |
1003 committed as 89ba615ea1ec |
1005 working directory is now at 89ba615ea1ec |
1004 working directory is now at 89ba615ea1ec |
1256 |
1255 |
1257 $ hg evolve --all --phase-divergent |
1256 $ hg evolve --all --phase-divergent |
1258 recreate:[2] added m |
1257 recreate:[2] added m |
1259 atop:[1] added m and n |
1258 atop:[1] added m and n |
1260 committed as 86419909e017 |
1259 committed as 86419909e017 |
1261 1 new orphan changesets |
|
1262 recreate:[4] added n |
1260 recreate:[4] added n |
1263 atop:[1] added m and n |
1261 atop:[1] added m and n |
1264 rebasing to destination parent: d3873e73d99e |
1262 rebasing to destination parent: d3873e73d99e |
1265 committed as 88b0dae5369a |
1263 committed as 88b0dae5369a |
1266 working directory is now at 88b0dae5369a |
1264 working directory is now at 88b0dae5369a |