diff tests/test-evolve-content-divergent-interrupted.t @ 5811:4688b7eb7e40

evolve: preserve wdir when using --stop

After this change using hg evolve --stop update the working copy
parent back to where the working copy was before the hg evolve
operation (or the successors of that)

--- a/tests/test-evolve-content-divergent-interrupted.t	Mon Mar 01 19:22:33 2021 +0800
+++ b/tests/test-evolve-content-divergent-interrupted.t	Wed Aug 26 23:27:17 2020 +0530
@@ -538,12 +538,12 @@
 
   $ hg evolve --stop
   stopped the interrupted evolve
-  working directory is now at e49523854bc8
+  working directory is now at 517d4375cb72
 
   $ hg glog
-  *  7:517d4375cb72 added d
+  @  7:517d4375cb72 added d
   |   () draft
-  | @  5:e49523854bc8 added d
+  | *  5:e49523854bc8 added d
   | |   () draft
   | o  3:ca1b80f7960a added c
   | |   () draft
@@ -560,7 +560,7 @@
 
 Making changes to make sure that it hits conflict while relocating
   $ hg up -r 3
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+  2 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ echo "some_changes" >> a
   $ hg amend
   1 new orphan changesets
@@ -614,11 +614,10 @@
 
   $ hg evolve --stop
   stopped the interrupted evolve
-  working directory is now at c7586e2a9264
+  working directory is now at 0892835a581f
 
-XXX: we should have preserved the wdir to be at rev 10
   $ hg glog
-  *  10:0892835a581f added d
+  @  10:0892835a581f added d
   |   () draft
   o  8:33c16a2e0eb8 added c
   |   () draft
@@ -626,7 +625,7 @@
   | |   () draft
   o |  2:b1661037fa25 added b
   |/    () draft
-  @  1:c7586e2a9264 added a
+  o  1:c7586e2a9264 added a
   |   () draft
   o  0:8fa14d15e168 added hgignore
       () draft