diff tests/test-evolve-abort-phasediv.t @ 6401:716912541759 mercurial-5.0

test-compat: merge mercurial-5.1 into mercurial-5.0
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 07 Feb 2023 10:51:10 +0400
parents e82ad19eb3cc e5bd76f95145
children
line wrap: on
line diff
--- a/tests/test-evolve-abort-phasediv.t	Fri Dec 09 00:41:21 2022 +0400
+++ b/tests/test-evolve-abort-phasediv.t	Tue Feb 07 10:51:10 2023 +0400
@@ -24,14 +24,6 @@
   > abort = evolve --abort
   > EOF
 
-#testcases inmemory ondisk
-#if inmemory
-  $ cat >> $HGRCPATH <<EOF
-  > [experimental]
-  > evolution.in-memory = yes
-  > EOF
-#endif
-
   $ hg init abortrepo
   $ cd abortrepo
   $ echo ".*\.orig" > .hgignore
@@ -299,7 +291,7 @@
   continue: hg evolve --continue
   $ hg evolve --continue
   evolving 9:28cd06b3f801 "added c"
-  committed as 95d746965290
+  committed as 92acf49069a4
   recreate:[10] added d
   atop:[4] added d
   rebasing to destination parent: ca1b80f7960a