diff -r cd90da787a44 -r e1a230cc4527 tests/test-evolve.t --- a/tests/test-evolve.t Mon Oct 23 15:50:18 2017 +0200 +++ b/tests/test-evolve.t Wed Nov 01 23:57:56 2017 +0100 @@ -412,7 +412,7 @@ | o 0 : base - test - $ hg evolve --any --traceback --phasedivergent + $ hg evolve --any --traceback --phase-divergent recreate:[8] another feature that rox atop:[7] another feature (child of ba0ec09b1bab) computing new diff @@ -1062,7 +1062,7 @@ |/ o 0 : a0 - test - $ hg evolve -r "desc('add new file bumped')" --phasedivergent + $ hg evolve -r "desc('add new file bumped')" --phase-divergent recreate:[12] add new file bumped atop:[11] a2 computing new diff @@ -1123,7 +1123,7 @@ set of specified revisions is empty [1] - $ hg evolve --rev "cce26b684bfe::" --phasedivergent + $ hg evolve --rev "cce26b684bfe::" --phase-divergent no phasedivergent changesets in specified revisions (do you want to use --orphan) [2]