diff tests/test-evolve-stop-phasediv.t @ 5823:fd039a7f0c3c mercurial-5.6

test-compat: merge stable into mercurial-5.6

# no-check-commit

--- a/tests/test-evolve-stop-phasediv.t	Fri Jan 29 17:23:31 2021 +0800
+++ b/tests/test-evolve-stop-phasediv.t	Thu Mar 11 12:29:50 2021 +0800
@@ -16,6 +16,14 @@
   > EOF
   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
+#testcases inmemory ondisk
+#if inmemory
+  $ cat >> $HGRCPATH <<EOF
+  > [experimental]
+  > evolution.in-memory = yes
+  > EOF
+#endif
+
   $ hg init stoprepo
   $ cd stoprepo
   $ echo ".*\.orig" > .hgignore
@@ -90,15 +98,14 @@
 
   $ hg evolve --stop
   stopped the interrupted evolve
-  working directory is now at ca1b80f7960a
+  working directory is now at ddba58020bc0
 
-XXX: maybe we should update wdir to where it was
   $ hg glog
-  *  6:ddba58020bc0 added d
+  @  6:ddba58020bc0 added d
   |   () draft
   | o  4:c41c793e0ef1 added d
   | |   () public
-  | @  3:ca1b80f7960a added c
+  | o  3:ca1b80f7960a added c
   | |   () public
   | o  2:b1661037fa25 added b
   |/    () public