--- a/tests/test-evolve.t	Sat Mar 09 19:35:45 2019 +0530
+++ b/tests/test-evolve.t	Sun Apr 21 12:06:31 2019 +0530
@@ -1340,74 +1340,18 @@
   $ hg fold --exact "98e171e2f272::"
   2 changesets folded
 
-Check that evolve shows error while handling split commits
---------------------------------------
+Check that dirstate changes are kept at failure for conflicts (issue4966)
+----------------------------------------
 
   $ cat >> $HGRCPATH <<EOF
   > [experimental]
   > evolution=all
   > EOF
 
-  $ glog -r "0cf3707e8971::"
-  o  28:92ca6f3984de@default(draft) add gg
-  |
-  | @  27:2d1b55e10be9@default(draft) add unstableifparentisfolded
-  |/
-  | o  18:0c049e4e5422@default(draft) add gh
-  |/
-  o  16:0cf3707e8971@default(draft) a3
-  |
-  ~
-
-Create a split commit
-  $ printf "oo" > oo;
-  $ printf "pp" > pp;
-  $ hg add oo pp
-  $ hg commit -m "oo+pp"
-  $ mkcommit uu
-  $ hg up 2d1b55e10be9
-  0 files updated, 0 files merged, 3 files removed, 0 files unresolved
-  $ printf "oo" > oo;
-  $ hg add oo
-  $ hg commit -m "_oo"
-  created new head
-  $ printf "pp" > pp;
-  $ hg add pp
-  $ hg commit -m "_pp"
-  $ hg prune --succ "desc(_oo) + desc(_pp)" -r "desc('oo+pp')" --split
-  1 changesets pruned
-  1 new orphan changesets
-  $ glog -r "0cf3707e8971::"
-  @  32:c7dbf668e9d5@default(draft) _pp
-  |
-  o  31:2b5a32114b3d@default(draft) _oo
-  |
-  | *  30:4d122571f3b6@default(draft) add uu
-  | |
-  | x  29:7da3e73df8a5@default(draft) oo+pp
-  |/
-  | o  28:92ca6f3984de@default(draft) add gg
-  | |
-  o |  27:2d1b55e10be9@default(draft) add unstableifparentisfolded
-  |/
-  | o  18:0c049e4e5422@default(draft) add gh
-  |/
-  o  16:0cf3707e8971@default(draft) a3
-  |
-  ~
-  $ hg evolve --rev "0cf3707e8971::" --update
-  move:[30] add uu
-  atop:[32] _pp
-  working directory is now at be23044af550
-
-
-Check that dirstate changes are kept at failure for conflicts (issue4966)
-----------------------------------------
-
   $ echo "will be amended" > newfile
   $ hg commit -m "will be amended"
   $ hg parents
-  34	: will be amended - test
+  29	: will be amended - test
 
   $ echo "will be evolved safely" >> a
   $ hg commit -m "will be evolved safely"
@@ -1418,17 +1362,11 @@
   $ hg commit -m "will cause conflict at evolve"
 
   $ glog -r "0cf3707e8971::"
-  @  36:59c37c5bebd1@default(draft) will cause conflict at evolve
-  |
-  o  35:7cc12c6c7862@default(draft) will be evolved safely
-  |
-  o  34:98c7ab460e6b@default(draft) will be amended
+  @  31:5be050657ca5@default(draft) will cause conflict at evolve
   |
-  o  33:be23044af550@default(draft) add uu
+  o  30:748126f98ff1@default(draft) will be evolved safely
   |
-  o  32:c7dbf668e9d5@default(draft) _pp
-  |
-  o  31:2b5a32114b3d@default(draft) _oo
+  o  29:4548f3a8db2c@default(draft) will be amended
   |
   | o  28:92ca6f3984de@default(draft) add gg
   | |
@@ -1440,32 +1378,32 @@
   |
   ~
 
-  $ hg update -q 98c7ab460e6b
+  $ hg update -q -r "desc('will be amended')"
   $ echo "amended" > newfile
   $ hg amend -m "amended"
   2 new orphan changesets
 
-  $ hg evolve --rev "98c7ab460e6b::"
-  move:[35] will be evolved safely
-  atop:[37] amended
-  move:[36] will cause conflict at evolve
+  $ hg evolve --rev "desc('will be amended')::"
+  move:[30] will be evolved safely
+  atop:[32] amended
+  move:[31] will cause conflict at evolve
   merging newfile
   warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')
   fix conflicts and see `hg help evolve.interrupted`
   [1]
 
-  $ glog -r "be23044af550::" --hidden
-  @  38:61abd81de026@default(draft) will be evolved safely
+  $ glog -r "desc('add unstableifparentisfolded')::" --hidden
+  @  33:b9acdb1af6d5@default(draft) will be evolved safely
   |
-  o  37:df89d30f23e2@default(draft) amended
+  o  32:6ec468e4cb98@default(draft) amended
   |
-  | @  36:59c37c5bebd1@default(draft) will cause conflict at evolve
+  | @  31:5be050657ca5@default(draft) will cause conflict at evolve
   | |
-  | x  35:7cc12c6c7862@default(draft) will be evolved safely
+  | x  30:748126f98ff1@default(draft) will be evolved safely
   | |
-  | x  34:98c7ab460e6b@default(draft) will be amended
+  | x  29:4548f3a8db2c@default(draft) will be amended
   |/
-  o  33:be23044af550@default(draft) add uu
+  o  27:2d1b55e10be9@default(draft) add unstableifparentisfolded
   |
   ~