diff tests/test-stabilize-result.t @ 1047:d830377bf186

evolve: adds a --confirm option

This option lets the use double check if it wants the evolve operation.

--- a/tests/test-stabilize-result.t	Fri Aug 08 23:11:09 2014 -0700
+++ b/tests/test-stabilize-result.t	Fri Aug 08 23:02:26 2014 -0700
@@ -29,9 +29,10 @@
   $ echo a >> a
   $ hg amend -m changea
   1 new unstable changesets
-  $ hg evolve -v
+  $ hg evolve -v --confirm
   move:[2] changea
   atop:[4] changea
+  perform evolve? [Ny] y
   hg rebase -r cce2c55b8965 -d fb9d051ec0a4
   resolving manifests
   $ glog --hidden
@@ -157,9 +158,10 @@
   hg update 1cf0aacfd363;
   hg revert --all --rev (73b15c7566e9|d5c7ef82d003); (re)
   hg commit --msg "bumped update to %s" (no-eol)
-  $ hg evolve --any
+  $ hg evolve --any --confirm
   recreate:[12] newer a
   atop:[8] newer a
+  perform evolve? [Ny] y
   rebasing to destination parent: 66719795a494
   computing new diff
   committed as (a7cabd7bd9c2|671b9d7eeaec) (re)
@@ -232,7 +234,11 @@
 
 Stabilize it
 
-  $ hg evolve -qn --traceback
+  $ hg evolve -qn --traceback --confirm
+  merge:[19] More addition
+  with: [17] More addition
+  base: [15] More addition
+  perform evolve? [Ny] y
   hg update -c eacc9c8240fe &&
   hg merge d2f173e25686 &&
   hg commit -m "auto merge resolving conflict between eacc9c8240fe and d2f173e25686"&&