diff tests/test-evolve.t @ 1404:848a04c078c7

evolve: add selector for trouble types This patch adds command line flags to select the kind of troubles to solve. Before this patch evolve was solving any kind of troubled. With this patch evolve --all and evolve --rev can be configured to only solve only some type of troubles (divergent, bumped or unstable). To give this choice to the user we add three new command line flags to the evolve command: --bumped, --divergent and --unstable.
author Laurent Charignon <lcharignon@fb.com>
date Tue, 16 Jun 2015 15:14:37 -0700
parents 7ddcbf5469bc
children eaf82490af76
line wrap: on
line diff
--- a/tests/test-evolve.t	Fri Jun 19 13:57:16 2015 -0700
+++ b/tests/test-evolve.t	Tue Jun 16 15:14:37 2015 -0700
@@ -332,7 +332,7 @@
   |
   o  0	: base - test
   
-  $ hg evolve --any --traceback
+  $ hg evolve --any --traceback --bumped
   recreate:[8] another feature that rox
   atop:[7] another feature (child of ba0ec09b1bab)
   computing new diff
@@ -959,7 +959,7 @@
   |/
   o  0	: a0 - test
   
-  $ hg evolve -r 12
+  $ hg evolve -r 12 --bumped
   recreate:[12] add new file bumped
   atop:[11] a2
   computing new diff
@@ -1017,9 +1017,13 @@
 
 Evolving an empty revset should do nothing
   $ hg evolve --rev "16 and 15"
-  No troubled changes in the specified revisions
+  abort: no troubled changes in the specified revisions
+  [255]
 
-  $ hg evolve --rev "14::"
+  $ hg evolve --rev "14::" --bumped
+  abort: no troubled changes in the specified revisions
+  [255]
+  $ hg evolve --rev "14::" --unstable
   move:[15] add gg
   atop:[18] a3
   move:[16] add gh