equal
deleted
inserted
replaced
407 o 0:e55e0562ee93@default(public) base |
407 o 0:e55e0562ee93@default(public) base |
408 |
408 |
409 $ hg evolve --any --traceback --phase-divergent |
409 $ hg evolve --any --traceback --phase-divergent |
410 recreate:[6] another feature that rox |
410 recreate:[6] another feature that rox |
411 atop:[5] another feature (child of ba0ec09b1bab) |
411 atop:[5] another feature (child of ba0ec09b1bab) |
412 computing new diff |
|
413 committed as aca219761afb |
412 committed as aca219761afb |
414 working directory is now at aca219761afb |
413 working directory is now at aca219761afb |
415 $ glog |
414 $ glog |
416 @ 7:aca219761afb@default(draft) phase-divergent update to 99833d22b0c6: |
415 @ 7:aca219761afb@default(draft) phase-divergent update to 99833d22b0c6: |
417 | |
416 | |
1059 o 0 : a0 - test |
1058 o 0 : a0 - test |
1060 |
1059 |
1061 $ hg evolve -r "desc('add new file bumped')" --phase-divergent |
1060 $ hg evolve -r "desc('add new file bumped')" --phase-divergent |
1062 recreate:[11] add new file bumped |
1061 recreate:[11] add new file bumped |
1063 atop:[10] a2 |
1062 atop:[10] a2 |
1064 computing new diff |
|
1065 committed as a8bb31d4b7f2 |
1063 committed as a8bb31d4b7f2 |
1066 working directory is now at a8bb31d4b7f2 |
1064 working directory is now at a8bb31d4b7f2 |
1067 $ hg evolve --any |
1065 $ hg evolve --any |
1068 move:[8] a3 |
1066 move:[8] a3 |
1069 atop:[12] phase-divergent update to d952e93add6f: |
1067 atop:[12] phase-divergent update to d952e93add6f: |