diff tests/test-evolve.t @ 6066:34f5c849fc1d mercurial-5.5

test-compat: merge mercurial-5.6 into mercurial-5.5

# no-check-commit

--- a/tests/test-evolve.t	Tue Oct 12 11:32:36 2021 +0300
+++ b/tests/test-evolve.t	Tue Oct 12 11:53:21 2021 +0300
@@ -10,14 +10,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
-
   $ mkcommit() {
   >    echo "$1" > "$1"
   >    hg add "$1"
@@ -1392,8 +1384,6 @@
   move:[30] will be evolved safely
   atop:[32] amended
   move:[31] will cause conflict at evolve
-  merging newfile (inmemory !)
-  hit merge conflicts; retrying merge in working copy (inmemory !)
   merging newfile
   warning: conflicts while merging newfile! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts