diff -r 406992d0d611 -r b237c1c6dc19 tests/test-evolve-bumped.t --- a/tests/test-evolve-bumped.t Thu Oct 26 09:02:25 2017 +0200 +++ b/tests/test-evolve-bumped.t Thu Oct 26 09:03:48 2017 +0200 @@ -70,7 +70,7 @@ no changes found 1 new phase-divergent changesets - $ hg evolve -a -A --phasedivergent + $ hg evolve -a -A --phase-divergent recreate:[2] tweak a atop:[1] modify a computing new diff @@ -122,5 +122,5 @@ | o 0:d3873e73d99e@default(public) init - $ hg evolve --all --phasedivergent + $ hg evolve --all --phase-divergent skipping b28e84916d8c : we do not handle merge yet