Mercurial > hg > evolve

changeset 7147:0c7ae7884d91 mercurial-5.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-5.6 into mercurial-5.5
author Anton Shestakov <av6@dwimlabs.net>
date Mon, 10 Mar 2025 18:33:58 +0400
parents dc135f90d184 (diff) 0db1c641f2a0 (current diff)
children 7fa85c1d512b
files
diffstat 21 files changed, 39 insertions(+), 487 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-evolve-abort-orphan.t
+++ b/tests/test-evolve-abort-orphan.t
@@ -27,14 +27,6 @@
   > EOF
 #endif
 
-#testcases inmemory ondisk
-#if inmemory
-  $ cat >> $HGRCPATH <<EOF
-  > [experimental]
-  > evolution.in-memory = yes
-  > EOF
-#endif
-
   $ hg init abortrepo
   $ cd abortrepo
   $ echo ".*\.orig" > .hgignore
@@ -105,8 +97,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
@@ -154,8 +144,6 @@
   $ hg evolve --all --update
   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
@@ -184,8 +172,6 @@
   move:[2] added b
   atop:[7] added a
   move:[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
@@ -298,8 +284,6 @@
   atop:[7] added a
   move:[6] foo to a
   atop:[7] added a
-  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
@@ -365,8 +349,6 @@
   atop:[7] added a
   move:[6] foo to a
   atop:[7] added a
-  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
@@ -445,8 +427,6 @@
   atop:[9] added c
   move:[6] foo to a
   atop:[7] added a
-  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
@@ -523,8 +503,6 @@
   move:[2] added b
   atop:[4] added a
   move:[3] 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
@@ -572,8 +550,6 @@
   $ hg next --evolve
   move:[3] added c
   atop:[5] added b
-  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
--- a/tests/test-evolve-abort-phasediv.t
+++ b/tests/test-evolve-abort-phasediv.t
@@ -27,14 +27,6 @@
   > EOF
 #endif
 
-#testcases inmemory ondisk
-#if inmemory
-  $ cat >> $HGRCPATH <<EOF
-  > [experimental]
-  > evolution.in-memory = yes
-  > EOF
-#endif
-
   $ hg init abortrepo
   $ cd abortrepo
   $ echo ".*\.orig" > .hgignore
--- a/tests/test-evolve-content-divergent-corner-cases.t
+++ b/tests/test-evolve-content-divergent-corner-cases.t
@@ -228,10 +228,10 @@
 
   $ cat >$TESTTMP/test_extension.py  << EOF
   > from mercurial import merge
-  > origupdate = merge._update
+  > origupdate = merge.update
   > def newupdate(*args, **kwargs):
   >   return origupdate(*args, **kwargs)
-  > merge._update = newupdate
+  > merge.update = newupdate
   > EOF
   $ cat >> $HGRCPATH << EOF
   > [extensions]
--- a/tests/test-evolve-continue.t
+++ b/tests/test-evolve-continue.t
@@ -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
@@ -120,8 +110,6 @@
   $ hg evolve --all
   move:[5] added c
   atop:[7] added b
-  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
@@ -184,8 +172,6 @@
   $ hg evolve --update
   move:[10] added e
   atop:[11] 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
@@ -226,8 +212,6 @@
   $ hg evolve --all --update
   move:[7] added b
   atop:[12] 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
@@ -313,8 +297,6 @@
   move:[15] added d
   atop:[19] added c
   move:[16] 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
@@ -330,8 +312,6 @@
   move:[17] added g
   atop:[21] added f
   move:[18] 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
@@ -379,8 +359,6 @@
   move:[22] added g
   atop:[24] 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
@@ -430,8 +408,6 @@
   $ hg next --evolve
   move:[25] added g
   atop:[27] 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
@@ -499,8 +475,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
deleted file mode 100644
--- a/tests/test-evolve-inmemory.t
+++ /dev/null
@@ -1,186 +0,0 @@
-Tests running `hg evolve` with in-memory merge.
-
-  $ . $TESTDIR/testlib/common.sh
-
-  $ cat >> $HGRCPATH <<EOF
-  > [extensions]
-  > evolve =
-  > drawdag=$RUNTESTDIR/drawdag.py
-  > [alias]
-  > glog = log -G -T '{rev}:{node|short} {separate(" ", phase, tags)}\n{desc|firstline}'
-  > [experimental]
-  > evolution.in-memory = yes
-  > EOF
-
-Test evolving a single orphan
-
-  $ hg init single-orphan
-  $ cd single-orphan
-  $ hg debugdrawdag <<'EOS'
-  >     C  # C/C = C\n
-  > B2  |  # B2/B = B2\n
-  > |   B  # B/B = B\n
-  >  \ /   # replace: B -> B2
-  >   A
-  > EOS
-  1 new orphan changesets
-  $ hg evolve
-  move:[3] C
-  atop:[2] B2
-  $ hg glog
-  o  4:a2a0434af50b draft tip
-  |  C
-  | x  3:46f17045c5ee draft C
-  | |  C
-  o |  2:3d6c495db414 draft B2
-  | |  B2
-  | x  1:caf23a7900cb draft B
-  |/   B
-  o  0:426bada5c675 draft A
-     A
-  $ hg cat -r tip B C
-  B2
-  C
-  $ cd ..
-
-Test that in-memory evolve works when there are conflicts
-and after continuing.
-
-  $ hg init conflicts
-  $ cd conflicts
-  $ hg debugdrawdag <<'EOS'
-  >     E  # E/E = E\n
-  >     |
-  >     D  # D/B = D\n
-  >     |
-  >     C  # C/C = C\n
-  > B2  |  # B2/B = B2\n
-  > |   B  # B/B = B\n
-  >  \ /   # replace: B -> B2
-  >   A
-  > EOS
-  3 new orphan changesets
-  $ hg evolve
-  move:[3] C
-  atop:[2] B2
-  move:[4] D
-  merging B
-  hit merge conflicts; retrying merge in working copy
-  merging B
-  warning: conflicts while merging B! (edit, then use 'hg resolve --mark')
-  unresolved merge conflicts
-  (see 'hg help evolve.interrupted')
-  [1]
-  $ hg glog
-  @  6:a2a0434af50b draft tip
-  |  C
-  | *  5:844900596917 draft E
-  | |  E
-  | %  4:a75d38413966 draft D
-  | |  D
-  | x  3:46f17045c5ee draft C
-  | |  C
-  o |  2:3d6c495db414 draft B2
-  | |  B2
-  | x  1:caf23a7900cb draft B
-  |/   B
-  o  0:426bada5c675 draft A
-     A
-  $ cat C
-  C
-  $ cat B
-  <<<<<<< destination: a2a0434af50b - test: C
-  B2
-  =======
-  D
-  >>>>>>> evolving:    a75d38413966 D - test: D
-  $ echo D2 > B
-  $ hg resolve -m
-  (no more unresolved files)
-  continue: hg evolve --continue
-  $ hg evolve --continue
-  evolving 4:a75d38413966 "D"
-  move:[5] E
-  atop:[7] D
-  $ hg glog
-  o  8:918ab8de4edf draft tip
-  |  E
-  o  7:c9677354e977 draft
-  |  D
-  o  6:a2a0434af50b draft
-  |  C
-  | x  5:844900596917 draft E
-  | |  E
-  | x  4:a75d38413966 draft D
-  | |  D
-  | x  3:46f17045c5ee draft C
-  | |  C
-  o |  2:3d6c495db414 draft B2
-  | |  B2
-  | x  1:caf23a7900cb draft B
-  |/   B
-  o  0:426bada5c675 draft A
-     A
-  $ hg cat -r tip B C E
-  D2
-  C
-  E
-  $ cd ..
-
-Test that in-memory merge is disabled if there's a precommit hook
-
-  $ hg init precommit-hook
-  $ cd precommit-hook
-  $ hg debugdrawdag <<'EOS'
-  >     C  # C/C = C\n
-  > B2  |  # B2/B = B2\n
-  > |   B  # B/B = B\n
-  >  \ /   # replace: B -> B2
-  >   A
-  > EOS
-  1 new orphan changesets
-  $ cat >> .hg/hgrc <<EOF
-  > [hooks]
-  > precommit = sh -c "echo 'running precommit hook'"
-  > EOF
-The hook is not run with in-memory=force
-  $ hg co B2
-  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  $ hg evolve --config experimental.evolution.in-memory=force --update
-  move:[3] C
-  atop:[2] B2
-  working directory is now at a2a0434af50b
-  $ hg glog
-  @  4:a2a0434af50b draft tip
-  |  C
-  | x  3:46f17045c5ee draft C
-  | |  C
-  o |  2:3d6c495db414 draft B2
-  | |  B2
-  | x  1:caf23a7900cb draft B
-  |/   B
-  o  0:426bada5c675 draft A
-     A
-  $ hg co tip^
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  $ hg amend -m B3
-  1 new orphan changesets
-The hook is run with in-memory=yes
-  $ hg next --config experimental.evolution.in-memory=yes
-  move:[4] C
-  atop:[5] B3
-  running precommit hook
-  working directory is now at 24f38f1ca271
-  $ hg glog
-  @  6:24f38f1ca271 draft tip
-  |  C
-  o  5:b43c30321752 draft
-  |  B3
-  | x  3:46f17045c5ee draft C
-  | |  C
-  +---x  2:3d6c495db414 draft B2
-  | |    B2
-  | x  1:caf23a7900cb draft B
-  |/   B
-  o  0:426bada5c675 draft A
-     A
--- a/tests/test-evolve-interrupted.t
+++ b/tests/test-evolve-interrupted.t
@@ -52,7 +52,7 @@
   $ hg l
   @  2 apricot and blueberry
   
-  *  1 banana
+  %  1 banana
   |
   x  0 apricot
   
@@ -80,7 +80,7 @@
   $ hg l
   @  2 apricot and blueberry
   
-  *  1 banana
+  %  1 banana
   |
   x  0 apricot
   
--- a/tests/test-evolve-noupdate.t
+++ b/tests/test-evolve-noupdate.t
@@ -18,14 +18,6 @@
   > evolve =
   > EOF
 
-#testcases inmemory ondisk
-#if inmemory
-  $ cat >> $HGRCPATH <<EOF
-  > [experimental]
-  > evolution.in-memory = yes
-  > EOF
-#endif
-
   $ hg init stoprepo
   $ cd stoprepo
   $ echo ".*\.orig" > .hgignore
--- a/tests/test-evolve-obshistory-amend-then-fold.t
+++ b/tests/test-evolve-obshistory-amend-then-fold.t
@@ -101,13 +101,7 @@
   |
   x  b7ea6d14e664 (3) B1
   |    folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
-  |      diff -r b7ea6d14e664 -r eb5a0daa2192+ changeset-description
-  |      --- a/changeset-description
-  |      +++ b/changeset-description
-  |      @@ -1,1 +1,1 @@
-  |      -B1
-  |      +C0
-  |
+  |      (No patch available, Mercurial 5.6 or newer is required for in-memory rebase)
   |
   x  0dec01379d3b (2) B0
        reworded(description) as b7ea6d14e664 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -160,13 +154,7 @@
   |
   x  b7ea6d14e664 (3) B1
   |    folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
-  |      diff -r b7ea6d14e664 -r eb5a0daa2192+ changeset-description
-  |      --- a/changeset-description
-  |      +++ b/changeset-description
-  |      @@ -1,1 +1,1 @@
-  |      -B1
-  |      +C0
-  |
+  |      (No patch available, Mercurial 5.6 or newer is required for in-memory rebase)
   |
   x  0dec01379d3b (2) B0
        reworded(description) as b7ea6d14e664 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
--- a/tests/test-evolve-obshistory-fold.t
+++ b/tests/test-evolve-obshistory-fold.t
@@ -93,13 +93,7 @@
   |\
   x |  0dec01379d3b (2) B0
    /     folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
-  |        diff -r 0dec01379d3b -r eb5a0daa2192+ changeset-description
-  |        --- a/changeset-description
-  |        +++ b/changeset-description
-  |        @@ -1,1 +1,1 @@
-  |        -B0
-  |        +C0
-  |
+  |        (No patch available, Mercurial 5.6 or newer is required for in-memory rebase)
   |
   x  471f378eab4c (1) A0
        folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -122,13 +116,7 @@
   $ hg obslog --hidden 0dec01379d3b --patch --no-origin
   x  0dec01379d3b (2) B0
        folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
-         diff -r 0dec01379d3b -r eb5a0daa2192+ changeset-description
-         --- a/changeset-description
-         +++ b/changeset-description
-         @@ -1,1 +1,1 @@
-         -B0
-         +C0
-  
+         (No patch available, Mercurial 5.6 or newer is required for in-memory rebase)
   
 Check that with all option, all changesets are shown
   $ hg obslog --hidden --all 0dec01379d3b --patch --no-origin
@@ -136,13 +124,7 @@
   |\
   x |  0dec01379d3b (2) B0
    /     folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
-  |        diff -r 0dec01379d3b -r eb5a0daa2192+ changeset-description
-  |        --- a/changeset-description
-  |        +++ b/changeset-description
-  |        @@ -1,1 +1,1 @@
-  |        -B0
-  |        +C0
-  |
+  |        (No patch available, Mercurial 5.6 or newer is required for in-memory rebase)
   |
   x  471f378eab4c (1) A0
        folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -166,13 +148,7 @@
   |\
   x |  0dec01379d3b (2) B0
    /     folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
-  |        diff -r 0dec01379d3b -r eb5a0daa2192+ changeset-description
-  |        --- a/changeset-description
-  |        +++ b/changeset-description
-  |        @@ -1,1 +1,1 @@
-  |        -B0
-  |        +C0
-  |
+  |        (No patch available, Mercurial 5.6 or newer is required for in-memory rebase)
   |
   x  471f378eab4c (1) A0
        folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
--- a/tests/test-evolve-obshistory-lots-of-splits.t
+++ b/tests/test-evolve-obshistory-lots-of-splits.t
@@ -194,12 +194,7 @@
   $ hg obslog de7290d8b885 --hidden --all --patch
   o  1ae8bc733a14 (4) A0
   |    split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
-  |      diff -r 1ae8bc733a14 d
-  |      --- a/d	Thu Jan 01 00:00:00 1970 +0000
-  |      +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  |      @@ -1,1 +0,0 @@
-  |      -45
-  |
+  |      (No patch available, Mercurial 5.6 or newer is required for in-memory rebase)
   |
   | o  337fec4d2edc (2) A0
   |/     split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -222,20 +217,11 @@
   |
   | @  c7f044602e9b (5) A0
   |/     split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
+  |        (No patch available, Mercurial 5.6 or newer is required for in-memory rebase)
   |
   | o  f257fde29c7a (3) A0
   |/     split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
-  |        diff -r f257fde29c7a c
-  |        --- a/c	Thu Jan 01 00:00:00 1970 +0000
-  |        +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  |        @@ -1,1 +0,0 @@
-  |        -44
-  |        diff -r f257fde29c7a d
-  |        --- a/d	Thu Jan 01 00:00:00 1970 +0000
-  |        +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  |        @@ -1,1 +0,0 @@
-  |        -45
-  |
+  |        (No patch available, Mercurial 5.6 or newer is required for in-memory rebase)
   |
   x  de7290d8b885 (1) A0
   
@@ -283,6 +269,7 @@
   $ hg obslog c7f044602e9b --patch
   @  c7f044602e9b (5) A0
   |    split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
+  |      (No patch available, Mercurial 5.6 or newer is required for in-memory rebase)
   |
   x  de7290d8b885 (1) A0
   
@@ -378,12 +365,7 @@
   $ hg obslog 2::5 --patch
   o  1ae8bc733a14 (4) A0
   |    split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
-  |      diff -r 1ae8bc733a14 d
-  |      --- a/d	Thu Jan 01 00:00:00 1970 +0000
-  |      +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  |      @@ -1,1 +0,0 @@
-  |      -45
-  |
+  |      (No patch available, Mercurial 5.6 or newer is required for in-memory rebase)
   |
   | o  337fec4d2edc (2) A0
   |/     split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -406,20 +388,11 @@
   |
   | @  c7f044602e9b (5) A0
   |/     split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
+  |        (No patch available, Mercurial 5.6 or newer is required for in-memory rebase)
   |
   | o  f257fde29c7a (3) A0
   |/     split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
-  |        diff -r f257fde29c7a c
-  |        --- a/c	Thu Jan 01 00:00:00 1970 +0000
-  |        +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  |        @@ -1,1 +0,0 @@
-  |        -44
-  |        diff -r f257fde29c7a d
-  |        --- a/d	Thu Jan 01 00:00:00 1970 +0000
-  |        +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  |        @@ -1,1 +0,0 @@
-  |        -45
-  |
+  |        (No patch available, Mercurial 5.6 or newer is required for in-memory rebase)
   |
   x  de7290d8b885 (1) A0
   
@@ -439,12 +412,7 @@
   $ hg obslog 5 --all --patch
   o  1ae8bc733a14 (4) A0
   |    split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
-  |      diff -r 1ae8bc733a14 d
-  |      --- a/d	Thu Jan 01 00:00:00 1970 +0000
-  |      +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  |      @@ -1,1 +0,0 @@
-  |      -45
-  |
+  |      (No patch available, Mercurial 5.6 or newer is required for in-memory rebase)
   |
   | o  337fec4d2edc (2) A0
   |/     split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
@@ -467,20 +435,11 @@
   |
   | @  c7f044602e9b (5) A0
   |/     split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
+  |        (No patch available, Mercurial 5.6 or newer is required for in-memory rebase)
   |
   | o  f257fde29c7a (3) A0
   |/     split(parent, content) from de7290d8b885 using split by test (Thu Jan 01 00:00:00 1970 +0000)
-  |        diff -r f257fde29c7a c
-  |        --- a/c	Thu Jan 01 00:00:00 1970 +0000
-  |        +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  |        @@ -1,1 +0,0 @@
-  |        -44
-  |        diff -r f257fde29c7a d
-  |        --- a/d	Thu Jan 01 00:00:00 1970 +0000
-  |        +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  |        @@ -1,1 +0,0 @@
-  |        -45
-  |
+  |        (No patch available, Mercurial 5.6 or newer is required for in-memory rebase)
   |
   x  de7290d8b885 (1) A0
   
--- a/tests/test-evolve-obshistory-split.t
+++ b/tests/test-evolve-obshistory-split.t
@@ -182,6 +182,7 @@
   | @  f257fde29c7a (3) A0
   |/     split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000)
   |        note: testing split
+  |        (No patch available, Mercurial 5.6 or newer is required for in-memory rebase)
   |
   x  471597cad322 (1) A0
   
@@ -191,6 +192,7 @@
   @  f257fde29c7a (3) A0
   |    split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000)
   |      note: testing split
+  |      (No patch available, Mercurial 5.6 or newer is required for in-memory rebase)
   |
   x  471597cad322 (1) A0
   
@@ -209,6 +211,7 @@
   | @  f257fde29c7a (3) A0
   |/     split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000)
   |        note: testing split
+  |        (No patch available, Mercurial 5.6 or newer is required for in-memory rebase)
   |
   x  471597cad322 (1) A0
   
@@ -248,6 +251,7 @@
   | @  f257fde29c7a (3) A0
   |/     split(parent, content) from 471597cad322 using split by test (Thu Jan 01 00:00:00 1970 +0000)
   |        note: testing split
+  |        (No patch available, Mercurial 5.6 or newer is required for in-memory rebase)
   |
   x  471597cad322 (1) A0
   
--- a/tests/test-evolve-phase-divergence.t
+++ b/tests/test-evolve-phase-divergence.t
@@ -1832,39 +1832,7 @@
   $ hg obslog --patch
   @  9eebcb77a7e2 (3) phase-divergent update to 3074c7249d20:
   |    rewritten(description, parent, content) from 599454370881 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
-  |      diff -r 599454370881+ -r 9eebcb77a7e2 changeset-description
-  |      --- a/changeset-description
-  |      +++ b/changeset-description
-  |      @@ -1,1 +1,3 @@
-  |      +phase-divergent update to 3074c7249d20:
-  |      +
-  |       E2
-  |
-  |      diff -r 9eebcb77a7e2 letters
-  |      --- a/letters	Thu Jan 01 00:00:00 1970 +0000
-  |      +++ b/letters	Thu Jan 01 00:00:00 1970 +0000
-  |      @@ -1,7 +1,7 @@
-  |       a
-  |       b
-  |       c
-  |      -D
-  |      +d
-  |       e
-  |       f
-  |       g
-  |      diff -r 9eebcb77a7e2 numbers
-  |      --- a/numbers	Thu Jan 01 00:00:00 1970 +0000
-  |      +++ b/numbers	Thu Jan 01 00:00:00 1970 +0000
-  |      @@ -1,7 +1,7 @@
-  |       1
-  |       2
-  |       3
-  |      -four
-  |      +4
-  |       5
-  |       6
-  |       seven
-  |
+  |      (No patch available, Mercurial 5.6 or newer is required for in-memory rebase)
   |
   x  599454370881 (2) E2
   |    rewritten(description, content) from 3074c7249d20 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
--- a/tests/test-evolve-phase.t
+++ b/tests/test-evolve-phase.t
@@ -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
--- a/tests/test-evolve-progress.t
+++ b/tests/test-evolve-progress.t
@@ -33,7 +33,7 @@
    ancestor: a87874c6ec31, local: fd0a2402f834+, remote: 4f60c78b6d58
    a: remote is newer -> g
   getting a
-  updating: a 1/1 files (100.00%)
+  updating: a 1/2 files (50.00%)
   committing files:
   a
   committing manifest
@@ -61,7 +61,7 @@
    ancestor: 769574b07a96, local: 53c0008d98a0+, remote: 22782fddc0ab
    b: remote is newer -> g
   getting b
-  updating: b 1/1 files (100.00%)
+  updating: b 1/2 files (50.00%)
   committing files:
   b
   committing manifest
@@ -94,7 +94,7 @@
    ancestor: fd0a2402f834, local: 152c368c622b+, remote: 5f16d91ecde0
    a: remote is newer -> g
   getting a
-  updating: a 1/1 files (100.00%)
+  updating: a 1/2 files (50.00%)
   committing files:
   a
   committing manifest
@@ -171,7 +171,7 @@
    ancestor: 53c0008d98a0, local: 55f7ff45dec4+, remote: 385376d04062
    b: remote is newer -> g
   getting b
-  updating: b 1/1 files (100.00%)
+  updating: b 1/2 files (50.00%)
   committing files:
   b
   committing manifest
--- a/tests/test-evolve-public-content-divergent-corner-cases.t
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t
@@ -382,29 +382,7 @@
   |
   | *  e568fd1029bb (4) added c e
   |/     rewritten(description, parent, content) from 9150fe93bec6 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
-  |        diff -r 9150fe93bec6+ -r e568fd1029bb changeset-description
-  |        --- a/changeset-description
-  |        +++ b/changeset-description
-  |        @@ -1,1 +1,1 @@
-  |        -added d
-  |        +added c e
-  |
-  |        diff -r e568fd1029bb c
-  |        --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  |        +++ b/c	Thu Jan 01 00:00:00 1970 +0000
-  |        @@ -0,0 +1,1 @@
-  |        +cfoo
-  |        diff -r e568fd1029bb d
-  |        --- a/d	Thu Jan 01 00:00:00 1970 +0000
-  |        +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  |        @@ -1,1 +0,0 @@
-  |        -d
-  |        diff -r e568fd1029bb e
-  |        --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-  |        +++ b/e	Thu Jan 01 00:00:00 1970 +0000
-  |        @@ -0,0 +1,1 @@
-  |        +e
-  |
+  |        (No patch available, Mercurial 5.6 or newer is required for in-memory rebase)
   |
   x  9150fe93bec6 (3) added d
   
--- a/tests/test-evolve-stop-orphan.t
+++ b/tests/test-evolve-stop-orphan.t
@@ -16,14 +16,6 @@
   > evolve =
   > EOF
 
-#testcases inmemory ondisk
-#if inmemory
-  $ cat >> $HGRCPATH <<EOF
-  > [experimental]
-  > evolution.in-memory = yes
-  > EOF
-#endif
-
   $ hg init stoprepo
   $ cd stoprepo
   $ echo ".*\.orig" > .hgignore
@@ -96,8 +88,6 @@
   $ hg evolve
   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
@@ -144,8 +134,6 @@
   $ hg next --evolve
   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
@@ -202,8 +190,6 @@
   $ hg evolve --update
   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
@@ -254,8 +240,6 @@
   atop:[7] added hgignore
   move:[2] added b
   move:[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
@@ -294,8 +278,6 @@
   $ hg evolve --all
   move:[5] added c
   atop:[9] added b
-  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
@@ -371,8 +353,6 @@
   move:[9] added b
   atop:[12] added a
   move:[10] 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
--- a/tests/test-evolve-stop-phasediv.t
+++ b/tests/test-evolve-stop-phasediv.t
@@ -16,14 +16,6 @@
   > evolve =
   > EOF
 
-#testcases inmemory ondisk
-#if inmemory
-  $ cat >> $HGRCPATH <<EOF
-  > [experimental]
-  > evolution.in-memory = yes
-  > EOF
-#endif
-
   $ hg init stoprepo
   $ cd stoprepo
   $ echo ".*\.orig" > .hgignore
--- a/tests/test-evolve-templates.t
+++ b/tests/test-evolve-templates.t
@@ -158,11 +158,11 @@
   
 
   $ hg log -GT '{successors|json}\n'
-  o  []
+  o  ""
   |
   | @  [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
   |/
-  o  []
+  o  ""
   
 
   $ hg up 'desc(A1)' --hidden
--- a/tests/test-evolve-wdir.t
+++ b/tests/test-evolve-wdir.t
@@ -37,14 +37,6 @@
   > glog = log --graph --template "{rev}:{node|short} ({phase}): {desc|firstline} {if(troubles, '[{troubles}]')}\n"
   > EOF
 
-#testcases inmemory ondisk
-#if inmemory
-  $ cat >> $HGRCPATH <<EOF
-  > [experimental]
-  > evolution.in-memory = yes
-  > EOF
-#endif
-
   $ hg init repo
   $ cd repo
   $ mkcommit c_A
--- a/tests/test-evolve.t
+++ b/tests/test-evolve.t
@@ -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"
@@ -1400,8 +1392,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
--- a/tests/test-stabilize-order.t
+++ b/tests/test-stabilize-order.t
@@ -3,14 +3,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
-
   $ glog() {
   >   hg log -G --template '{rev}:{node|short}@{branch}({phase}) {desc|firstline}\n' "$@"
   > }
@@ -78,8 +70,8 @@
   b
   committing manifest
   committing changelog
-  resolving manifests (ondisk !)
-  removing b (ondisk !)
+  resolving manifests
+  removing b
   $ glog
   o  6:bede829dd2d3@default(draft) addb
   |
@@ -101,17 +93,14 @@
   move:[3] addc
   atop:[6] addb
   hg rebase -r 7a7552255fb5 -d bede829dd2d3
-  resolving manifests (ondisk !)
-  getting b (ondisk !)
+  resolving manifests
+  getting b
   resolving manifests
   getting c
   committing files:
   c
   committing manifest
   committing changelog
-  resolving manifests (inmemory !)
-  getting b (inmemory !)
-  getting c (inmemory !)
   working directory is now at 65095d7d0dd5
   $ hg debugobsolete > successors.new
   $ diff -u successors.old successors.new
@@ -166,17 +155,15 @@
   move:[7] addc
   atop:[8] addb
   hg rebase -r 65095d7d0dd5 -d 036cf654e942
-  resolving manifests (ondisk !)
-  removing c (ondisk !)
-  getting b (ondisk !)
+  resolving manifests
+  removing c
+  getting b
   resolving manifests
   getting c
   committing files:
   c
   committing manifest
   committing changelog
-  resolving manifests (inmemory !)
-  getting b (inmemory !)
   working directory is now at e99ecf51c867
   $ glog
   @  9:e99ecf51c867@default(draft) addc