tests/test-evolve-continue.t
changeset 4576 96ce1030d2fb
parent 4505 cc2bbe2701a3
child 4577 bcd52ce0916d
--- a/tests/test-evolve-continue.t	Wed Apr 24 15:57:49 2019 +0200
+++ b/tests/test-evolve-continue.t	Sun Apr 14 02:18:19 2019 +0800
@@ -113,7 +113,7 @@
   o  0:8fa14d15e168 added hgignore
       () draft
 
-  $ hg evolve
+  $ hg evolve --update
   move:[7] added e
   atop:[8] added d
   merging e
@@ -153,7 +153,7 @@
   $ hg amend
   3 new orphan changesets
 
-  $ hg evolve --all
+  $ hg evolve --all --update
   move:[2] added b
   atop:[9] added a
   merging b
@@ -236,7 +236,7 @@
   o  0:8fa14d15e168 added hgignore
       () draft
 
-  $ hg evolve --all
+  $ hg evolve --all --update
   move:[12] added d
   atop:[16] added c
   move:[13] added f
@@ -294,7 +294,7 @@
   $ hg amend
   2 new orphan changesets
 
-  $ hg evolve --all --confirm<<EOF
+  $ hg evolve --all --update --confirm << EOF
   > y
   > EOF
   move:[19] added g
@@ -310,7 +310,7 @@
   (no more unresolved files)
   continue: hg evolve --continue
 
-  $ hg evolve --continue<<EOF
+  $ hg evolve --continue << EOF
   > y
   > EOF
   evolving 19:981e615b14ca "added g"