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

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

# no-check-commit

--- a/tests/test-evolve-continue.t	Tue Oct 12 11:32:36 2021 +0300
+++ b/tests/test-evolve-continue.t	Tue Oct 12 11:53:21 2021 +0300
@@ -10,14 +10,6 @@
   > evolve =
   > EOF
 
-#testcases inmemory ondisk
-#if inmemory
-  $ cat >> $HGRCPATH <<EOF
-  > [experimental]
-  > evolution.in-memory = yes
-  > EOF
-#endif
-
 Setting up the repo
 
   $ hg init repo
@@ -64,8 +56,6 @@
   $ hg evolve --all
   move:[4] added d
   atop:[5] added c
-  merging d (inmemory !)
-  hit merge conflicts; retrying merge in working copy (inmemory !)
   merging d
   warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
@@ -126,8 +116,6 @@
   $ hg evolve --update
   move:[7] added e
   atop:[8] added d
-  merging e (inmemory !)
-  hit merge conflicts; retrying merge in working copy (inmemory !)
   merging e
   warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
@@ -168,8 +156,6 @@
   $ hg evolve --all --update
   move:[2] added b
   atop:[9] added a
-  merging b (inmemory !)
-  hit merge conflicts; retrying merge in working copy (inmemory !)
   merging b
   warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
@@ -255,8 +241,6 @@
   move:[12] added d
   atop:[16] added c
   move:[13] added f
-  merging f (inmemory !)
-  hit merge conflicts; retrying merge in working copy (inmemory !)
   merging f
   warning: conflicts while merging f! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
@@ -272,8 +256,6 @@
   move:[14] added g
   atop:[18] added f
   move:[15] added h
-  merging h (inmemory !)
-  hit merge conflicts; retrying merge in working copy (inmemory !)
   merging h
   warning: conflicts while merging h! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
@@ -321,8 +303,6 @@
   move:[19] added g
   atop:[21] added f
   perform evolve? [Ny] y
-  merging g (inmemory !)
-  hit merge conflicts; retrying merge in working copy (inmemory !)
   merging g
   warning: conflicts while merging g! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
@@ -372,8 +352,6 @@
   $ hg next --evolve
   move:[22] added g
   atop:[24] added f
-  merging g (inmemory !)
-  hit merge conflicts; retrying merge in working copy (inmemory !)
   merging g
   warning: conflicts while merging g! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts
@@ -441,8 +419,6 @@
   $ hg evolve
   move:[3] added d, modified c
   atop:[5] added c
-  merging c (inmemory !)
-  hit merge conflicts; retrying merge in working copy (inmemory !)
   merging c
   warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
   unresolved merge conflicts