# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1571249404 25200
# Node ID 4101fab78314555c6109446f65d4f1a03e0464b2
# Parent  0ce6510b45ab39bdd201ba45406b2bdd7268a794
tests: simplify by pruning unwanted changesets a little earlier

The pruned commits are not relevant to the test case, so let's clean
them up at the end of the previous test case instead of part-way
through the next one.

diff -r 0ce6510b45ab -r 4101fab78314 tests/test-evolve-orphan-merge.t
--- a/tests/test-evolve-orphan-merge.t	Sat Oct 19 10:42:09 2019 -0700
+++ b/tests/test-evolve-orphan-merge.t	Wed Oct 16 11:10:04 2019 -0700
@@ -134,11 +134,18 @@
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     merging a and b
   
+
+Clean up to prepare for next test case
+  $ hg prune -r 64370c9805e7 -r 3d41537b44ca -r 968d205ba4d8
+  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
+  working directory is now at 8fa14d15e168
+  3 changesets pruned
+
 2) When merging both the parents resulted in conflicts
 ------------------------------------------------------
 
   $ hg up 8fa14d15e168
-  0 files updated, 0 files merged, 2 files removed, 0 files unresolved
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo foo > c
   $ hg ci -Aqm "foo to c"
   $ hg prev
@@ -152,24 +159,6 @@
   |   () draft
   | o  8:1c165c673853 foo to c
   |/    () draft
-  | o    7:968d205ba4d8 merging a and b
-  | |\    () draft
-  +---o  6:3d41537b44ca added a
-  | |     () draft
-  | o  4:64370c9805e7 added b
-  |/    () draft
-  o  0:8fa14d15e168 added hgignore
-      () draft
-
-Prune old test changesets to have clear graph view
-  $ hg prune -r 64370c9805e7 -r 3d41537b44ca -r 968d205ba4d8
-  3 changesets pruned
-
-  $ hg glog
-  @  9:d0f84b25d4e3 bar to c
-  |   () draft
-  | o  8:1c165c673853 foo to c
-  |/    () draft
   o  0:8fa14d15e168 added hgignore
       () draft