tests/test-stabilize-result.t
changeset 1391 35518d26b549
parent 1388 c96e4ab4e5cc
parent 1390 03f202bed47f
child 1396 ba95cec18fe9
--- a/tests/test-stabilize-result.t	Thu Jun 18 17:57:11 2015 -0700
+++ b/tests/test-stabilize-result.t	Thu Jun 18 23:45:37 2015 -0700
@@ -32,6 +32,12 @@
   $ hg evolve -v --confirm
   move:[2] changea
   atop:[4] changea
+  perform evolve? [Ny] n
+  abort: evolve aborted by user
+  [255]
+  $ echo y | hg evolve -v --confirm --config ui.interactive=True
+  move:[2] changea
+  atop:[4] changea
   perform evolve? [Ny] y
   hg rebase -r cce2c55b8965 -d fb9d051ec0a4
   resolving manifests
@@ -162,6 +168,12 @@
   $ hg evolve --any --confirm
   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
+  recreate:[12] newer a
+  atop:[8] newer a
   perform evolve? [Ny] y
   rebasing to destination parent: 66719795a494
   computing new diff
@@ -236,7 +248,14 @@
 
 Stabilize it
 
-  $ hg evolve -qn --traceback --confirm
+  $ hg evolve -qn --confirm
+  merge:[19] More addition
+  with: [17] More addition
+  base: [15] More addition
+  perform evolve? [Ny] n
+  abort: evolve aborted by user
+  [255]
+  $ echo y | hg evolve -qn --confirm --config ui.interactive=True
   merge:[19] More addition
   with: [17] More addition
   base: [15] More addition