--- a/tests/test-evolve.t	Mon Jun 30 10:25:08 2014 -0400
+++ b/tests/test-evolve.t	Mon Jun 30 13:29:49 2014 -0400
@@ -616,27 +616,23 @@
   $ hg fold
   abort: no revisions specified
   [255]
-  $ hg fold 6 --rev 10
-  abort: cannot specify both --rev and a target revision
-  [255]
   $ hg fold .
   single revision specified, nothing to fold
   [1]
-  $ hg fold 6 # want to run hg fold 6
-  2 changesets folded
+  $ hg fold 10 1
+  abort: cannot fold non-linear revisions
+  (given revisions are unrelated to parent of working directory)
+  [255]
+  $ hg fold -r 5
+  3 changesets folded
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ glog
-  @  11:dd4682c1a481@default(draft) add 1
-  |
-  o  5:0b9e50c35132@default(draft) add 3
-  |
-  o  4:ce341209337f@default(draft) add 4
-  |
-  | o  1:73d38bb17fd7@default(draft) add 1
-  |/
-  o  0:8685c6d34325@default(draft) add 0
+  $ hg fold 6 # want to run hg fold 6
+  abort: unknown revision '6'!
+  [255]
+  $ hg log -r 11 --template '{desc}\n'
+  add 3
   
-  $ hg log -r 11 --template '{desc}\n'
+  
   add 1
   
   
@@ -648,8 +644,8 @@
 
   $ hg up 4
   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
-  $ hg fold --rev 4::11 --user victor
-  3 changesets folded
+  $ hg fold --rev 4::11 --user victor --exact
+  2 changesets folded
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ glog
   @  12:d26d339c513f@default(draft) add 4
@@ -680,8 +676,7 @@
 
   $ hg olog
   4	: add 4 - test
-  5	: add 3 - test
-  11	: add 1 - test
+  11	: add 3 - test
 
 Test obsstore stat