--- a/tests/test-stabilize-result.t Thu Aug 10 17:57:50 2017 +0200
+++ b/tests/test-stabilize-result.t Thu Aug 10 19:31:55 2017 +0200
@@ -156,20 +156,20 @@
Stabilize!
- $ hg evolve --any --dry-run --bumped
+ $ hg evolve --any --dry-run --phasedivergent
recreate:[12] newer a
atop:[8] newer a
- hg rebase --rev (73b15c7566e9|d5c7ef82d003) --dest 66719795a494; (re)
+ hg rebase --rev d5c7ef82d003 --dest 66719795a494;
hg update 1cf0aacfd363;
- hg revert --all --rev (73b15c7566e9|d5c7ef82d003); (re)
+ hg revert --all --rev d5c7ef82d003;
hg commit --msg "bumped update to %s" (no-eol)
- $ hg evolve --any --confirm --bumped
+ $ hg evolve --any --confirm --phasedivergent
recreate:[12] newer a
atop:[8] newer a
perform evolve? [Ny] n
abort: evolve aborted by user
[255]
- $ echo y | hg evolve --any --confirm --config ui.interactive=True --bumped
+ $ echo y | hg evolve --any --confirm --config ui.interactive=True --phasedivergent
recreate:[12] newer a
atop:[8] newer a
perform evolve? [Ny] y