# HG changeset patch
# User Manuel Jacob <me@manueljacob.de>
# Date 1584747997 -3600
# Node ID e0885e2abf5963bd20325108a766212986d0e312
# Parent  a5876853ba151f3ef3c55f572583fd18153a3f4f
tests: merge two tests about split changesets

Because the removed test case is essentially already included in the
succeeding one, the tests are merged by removing the first.

diff -r a5876853ba15 -r e0885e2abf59 tests/test-evolve-split.t
--- a/tests/test-evolve-split.t	Wed Mar 11 16:05:53 2020 +0100
+++ b/tests/test-evolve-split.t	Sat Mar 21 00:46:37 2020 +0100
@@ -60,38 +60,12 @@
   move:[2] add uu
   atop:[4] _pp
 
-Split the changeset such that there's an unrelated changeset in between
-  $ hg --config extensions.strip= strip 4 -q
-  $ mkcommit bb
-  $ printf "pp" > pp;
-  $ hg add pp
-  $ hg commit -m "_pp"
-  $ hg prune --successor "desc(_oo) + desc(_pp)" -r "desc('oo+pp')" --split
-  1 changesets pruned
-  1 new orphan changesets
-  $ hg log -G
-  @  5:e4541785761d@default(draft) _pp
-  |
-  o  4:155f65ab6abc@default(draft) add bb
-  |
-  o  3:a7fdfda64c08@default(draft) _oo
-  |
-  | *  2:f52200b086ca@default(draft) add uu
-  | |
-  | x  1:d55647aaa0c6@default(draft) oo+pp
-  |/
-  o  0:58663bb03074@default(draft) add aa
-  
-  $ hg evolve --rev "0::"
-  move:[2] add uu
-  atop:[5] _pp
-
   $ cd ..
   $ hg init split-merged
   $ cd split-merged
   $ mkcommit aa
 
-Split the changeset such that the successors don't have a single root
+Split the changeset such that the successors don't have a single root and there's an unrelated changeset in between
   $ printf "oo" > oo;
   $ printf "pp" > pp;
   $ printf "qq" > qq;