Mercurial > public > mercurial-scm > evolve

changeset 6994:dc135f90d184 mercurial-5.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: rebase diffs are disabled on Mercurial 5.5 and older
author Anton Shestakov <av6@dwimlabs.net>
date Wed, 05 Feb 2025 23:29:59 +0100
parents b37826183298
children 88355b96b627 0c7ae7884d91
files tests/test-evolve-obshistory-amend-then-fold.t tests/test-evolve-obshistory-fold.t tests/test-evolve-obshistory-lots-of-splits.t tests/test-evolve-obshistory-split.t tests/test-evolve-phase-divergence.t tests/test-evolve-public-content-divergent-corner-cases.t
diffstat 6 files changed, 22 insertions(+), 149 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-evolve-obshistory-amend-then-fold.t	Wed Feb 05 23:13:02 2025 +0100
+++ b/tests/test-evolve-obshistory-amend-then-fold.t	Wed Feb 05 23:29:59 2025 +0100
@@ -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	Wed Feb 05 23:13:02 2025 +0100
+++ b/tests/test-evolve-obshistory-fold.t	Wed Feb 05 23:29:59 2025 +0100
@@ -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	Wed Feb 05 23:13:02 2025 +0100
+++ b/tests/test-evolve-obshistory-lots-of-splits.t	Wed Feb 05 23:29:59 2025 +0100
@@ -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	Wed Feb 05 23:13:02 2025 +0100
+++ b/tests/test-evolve-obshistory-split.t	Wed Feb 05 23:29:59 2025 +0100
@@ -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	Wed Feb 05 23:13:02 2025 +0100
+++ b/tests/test-evolve-phase-divergence.t	Wed Feb 05 23:29:59 2025 +0100
@@ -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-public-content-divergent-corner-cases.t	Wed Feb 05 23:13:02 2025 +0100
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Wed Feb 05 23:29:59 2025 +0100
@@ -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