diff tests/test-evolve-phase.t @ 5825:9b1bdd68d545 mercurial-5.5

tests: remove in-memory evolve cases (not supported prior to 5.6)
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 11 Mar 2021 12:51:00 +0800
parents fd039a7f0c3c
children 664f62e57231 e5bd76f95145
line wrap: on
line diff
--- a/tests/test-evolve-phase.t	Thu Mar 11 12:40:20 2021 +0800
+++ b/tests/test-evolve-phase.t	Thu Mar 11 12:51:00 2021 +0800
@@ -9,14 +9,6 @@
   > EOF
   $ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
 
-#testcases inmemory ondisk
-#if inmemory
-  $ cat >> $HGRCPATH <<EOF
-  > [experimental]
-  > evolution.in-memory = yes
-  > EOF
-#endif
-
 Testing when there are no conflicts during evolve
 
   $ hg init noconflict
@@ -91,8 +83,6 @@
   $ hg evolve
   move:[2] c
   atop:[3] b
-  merging a (inmemory !)
-  hit merge conflicts; retrying merge in working copy (inmemory !)
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts