diff tests/test-evolve-obshistory-amend-then-fold.t @ 5317:011b53a9d03c mercurial-4.7

test-compat: merge mercurial-4.8 into mercurial-4.7

--- a/tests/test-evolve-obshistory-amend-then-fold.t	Fri May 08 20:36:32 2020 +0800
+++ b/tests/test-evolve-obshistory-amend-then-fold.t	Fri May 08 22:18:15 2020 +0800
@@ -56,7 +56,7 @@
   | |  parent:      1:471f378eab4c
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  obsolete:    folded using fold as 4:eb5a0daa2192
+  | |  obsolete:    rewritten using fold as 4:eb5a0daa2192
   | |  summary:     B1
   | |
   | | x  changeset:   2:0dec01379d3b
@@ -68,7 +68,7 @@
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    folded using fold as 4:eb5a0daa2192
+  |    obsolete:    rewritten using fold as 4:eb5a0daa2192
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -84,7 +84,7 @@
   @    eb5a0daa2192 (4) C0
   |\
   x |  471f378eab4c (1) A0
-   /     folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+   /     rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   |        diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
   |        --- a/changeset-description
   |        +++ b/changeset-description
@@ -100,7 +100,7 @@
   |
   |
   x  b7ea6d14e664 (3) B1
-  |    folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   |      (No patch available, changesets rebased)
   |
   x  0dec01379d3b (2) B0
@@ -115,8 +115,22 @@
   
   $ hg obslog eb5a0daa2192 --patch
   @    eb5a0daa2192 (4) C0
-  |\     folded(description, parent, content) from 471f378eab4c, b7ea6d14e664 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
-  | |      (No patch available, too many predecessors (2))
+  |\     rewritten(description, content) from 471f378eab4c using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |      diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
+  | |      --- a/changeset-description
+  | |      +++ b/changeset-description
+  | |      @@ -1,1 +1,1 @@
+  | |      -A0
+  | |      +C0
+  | |
+  | |      diff -r 471f378eab4c -r eb5a0daa2192 B0
+  | |      --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+  | |      +++ b/B0	Thu Jan 01 00:00:00 1970 +0000
+  | |      @@ -0,0 +1,1 @@
+  | |      +B0
+  | |
+  | |    rewritten(description, parent, content) from b7ea6d14e664 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |      (No patch available, changesets rebased)
   | |
   x |  471f378eab4c (1) A0
    /
@@ -137,7 +151,7 @@
   @    eb5a0daa2192 (4) C0
   |\
   x |  471f378eab4c (1) A0
-   /     folded(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+   /     rewritten(description, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   |        diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
   |        --- a/changeset-description
   |        +++ b/changeset-description
@@ -153,7 +167,7 @@
   |
   |
   x  b7ea6d14e664 (3) B1
-  |    folded(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+  |    rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
   |      (No patch available, changesets rebased)
   |
   x  0dec01379d3b (2) B0
@@ -168,8 +182,22 @@
   
   $ hg obslog 1 --hidden --all --patch
   @    eb5a0daa2192 (4) C0
-  |\     folded(description, parent, content) from 471f378eab4c, b7ea6d14e664 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
-  | |      (No patch available, too many predecessors (2))
+  |\     rewritten(description, content) from 471f378eab4c using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |      diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
+  | |      --- a/changeset-description
+  | |      +++ b/changeset-description
+  | |      @@ -1,1 +1,1 @@
+  | |      -A0
+  | |      +C0
+  | |
+  | |      diff -r 471f378eab4c -r eb5a0daa2192 B0
+  | |      --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+  | |      +++ b/B0	Thu Jan 01 00:00:00 1970 +0000
+  | |      @@ -0,0 +1,1 @@
+  | |      +B0
+  | |
+  | |    rewritten(description, parent, content) from b7ea6d14e664 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |      (No patch available, changesets rebased)
   | |
   x |  471f378eab4c (1) A0
    /
@@ -215,7 +243,7 @@
                   "users": [
                       "test"
                   ],
-                  "verb": "folded"
+                  "verb": "rewritten"
               }
           ],
           "node": "b7ea6d14e664bdc8922221f7992631b50da3fb07",
@@ -270,7 +298,7 @@
                   "users": [
                       "test"
                   ],
-                  "verb": "folded"
+                  "verb": "rewritten"
               }
           ],
           "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
@@ -286,7 +314,25 @@
                       [
                           *, (glob)
                           0
-                      ],
+                      ]
+                  ],
+                  "effects": [
+                      "description",
+                      "content"
+                  ],
+                  "operations": [
+                      "fold"
+                  ],
+                  "prednodes": [
+                      "471f378eab4c5e25f6c77f785b27c936efb22874"
+                  ],
+                  "users": [
+                      "test"
+                  ],
+                  "verb": "rewritten"
+              },
+              {
+                  "dates": [
                       [
                           *, (glob)
                           0
@@ -301,13 +347,12 @@
                       "fold"
                   ],
                   "prednodes": [
-                      "471f378eab4c5e25f6c77f785b27c936efb22874",
                       "b7ea6d14e664bdc8922221f7992631b50da3fb07"
                   ],
                   "users": [
                       "test"
                   ],
-                  "verb": "folded"
+                  "verb": "rewritten"
               }
           ],
           "node": "eb5a0daa21923bbf8caeb2c42085b9e463861fd0",