Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-stabilize-result.t
changeset 3155 b237c1c6dc19
parent 3154 406992d0d611
child 3166 e1a230cc4527
child 3359 ae6fddf39933 
--- a/tests/test-stabilize-result.t	Thu Oct 26 09:02:25 2017 +0200
+++ b/tests/test-stabilize-result.t	Thu Oct 26 09:03:48 2017 +0200
@@ -153,20 +153,20 @@
 
 Stabilize!
 
-  $ hg evolve --any --dry-run --phasedivergent
+  $ hg evolve --any --dry-run --phase-divergent
   recreate:[9] newer a
   atop:[6] newer a
   hg rebase --rev d5c7ef82d003 --dest 66719795a494;
   hg update 1cf0aacfd363;
   hg revert --all --rev d5c7ef82d003;
   hg commit --msg "bumped update to %s" (no-eol)
-  $ hg evolve --any --confirm --phasedivergent
+  $ hg evolve --any --confirm --phase-divergent
   recreate:[9] newer a
   atop:[6] newer a
   perform evolve? [Ny] n
   abort: evolve aborted by user
   [255]
-  $ echo y | hg evolve --any --confirm --config ui.interactive=True --phasedivergent
+  $ echo y | hg evolve --any --confirm --config ui.interactive=True --phase-divergent
   recreate:[9] newer a
   atop:[6] newer a
   perform evolve? [Ny] y
evolve