diff tests/test-evolve-templates.t @ 6006:90af9db93d2b mercurial-4.7

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

--- a/tests/test-evolve-templates.t	Thu Aug 12 22:01:11 2021 +0200
+++ b/tests/test-evolve-templates.t	Thu Aug 12 22:01:14 2021 +0200
@@ -478,13 +478,13 @@
   | x  changeset:   2:0dec01379d3b
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  obsolete:    folded using fold as 3:eb5a0daa2192
+  | |  obsolete:    rewritten using fold as 3:eb5a0daa2192
   | |  summary:     B0
   | |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    folded using fold as 3:eb5a0daa2192
+  |    obsolete:    rewritten using fold as 3:eb5a0daa2192
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -507,21 +507,21 @@
   o  eb5a0daa2192
   |    Predecessors: 1:471f378eab4c
   |    semi-colon: 1:471f378eab4c
-  |    Origin: folded using fold from 1:471f378eab4c
+  |    Origin: rewritten using fold from 1:471f378eab4c
   |
   | @  471f378eab4c
   |/     Successors: 3:eb5a0daa2192
   |      semi-colon: 3:eb5a0daa2192
-  |      Fate: folded using fold as 3:eb5a0daa2192
+  |      Fate: rewritten using fold as 3:eb5a0daa2192
   |
   o  ea207398892e
   
   $ hg fateoriginlog
   o  eb5a0daa2192
-  |    Obsorigin: folded using fold from 1:471f378eab4c
+  |    Obsorigin: rewritten using fold from 1:471f378eab4c
   |
   | @  471f378eab4c
-  |/     Obsfate: folded using fold as 3:eb5a0daa2192
+  |/     Obsfate: rewritten using fold as 3:eb5a0daa2192
   |
   o  ea207398892e
   
@@ -538,29 +538,30 @@
   o  eb5a0daa2192
   |    Predecessors: 2:0dec01379d3b 1:471f378eab4c
   |    semi-colon: 2:0dec01379d3b; 1:471f378eab4c
-  |    Origin: folded using fold from 1:471f378eab4c, 2:0dec01379d3b
+  |    Origin: rewritten using fold from 2:0dec01379d3b
+  |    Origin: rewritten using fold from 1:471f378eab4c
   |
   | @  0dec01379d3b
   | |    Successors: 3:eb5a0daa2192
   | |    semi-colon: 3:eb5a0daa2192
-  | |    Fate: folded using fold as 3:eb5a0daa2192
+  | |    Fate: rewritten using fold as 3:eb5a0daa2192
   | |
   | x  471f378eab4c
   |/     Successors: 3:eb5a0daa2192
   |      semi-colon: 3:eb5a0daa2192
-  |      Fate: folded using fold as 3:eb5a0daa2192
+  |      Fate: rewritten using fold as 3:eb5a0daa2192
   |
   o  ea207398892e
   
   $ hg fateoriginlog
   o  eb5a0daa2192
-  |    Obsorigin: folded using fold from 1:471f378eab4c, 2:0dec01379d3b
+  |    Obsorigin: rewritten using fold from 2:0dec01379d3b; rewritten using fold from 1:471f378eab4c
   |
   | @  0dec01379d3b
-  | |    Obsfate: folded using fold as 3:eb5a0daa2192
+  | |    Obsfate: rewritten using fold as 3:eb5a0daa2192
   | |
   | x  471f378eab4c
-  |/     Obsfate: folded using fold as 3:eb5a0daa2192
+  |/     Obsfate: rewritten using fold as 3:eb5a0daa2192
   |
   o  ea207398892e
   
@@ -581,29 +582,30 @@
   @  eb5a0daa2192
   |    Predecessors: 2:0dec01379d3b 1:471f378eab4c
   |    semi-colon: 2:0dec01379d3b; 1:471f378eab4c
-  |    Origin: folded using fold from 1:471f378eab4c, 2:0dec01379d3b
+  |    Origin: rewritten using fold from 2:0dec01379d3b
+  |    Origin: rewritten using fold from 1:471f378eab4c
   |
   | x  0dec01379d3b
   | |    Successors: 3:eb5a0daa2192
   | |    semi-colon: 3:eb5a0daa2192
-  | |    Fate: folded using fold as 3:eb5a0daa2192
+  | |    Fate: rewritten using fold as 3:eb5a0daa2192
   | |
   | x  471f378eab4c
   |/     Successors: 3:eb5a0daa2192
   |      semi-colon: 3:eb5a0daa2192
-  |      Fate: folded using fold as 3:eb5a0daa2192
+  |      Fate: rewritten using fold as 3:eb5a0daa2192
   |
   o  ea207398892e
   
   $ hg fateoriginlog --hidden
   @  eb5a0daa2192
-  |    Obsorigin: folded using fold from 1:471f378eab4c, 2:0dec01379d3b
+  |    Obsorigin: rewritten using fold from 2:0dec01379d3b; rewritten using fold from 1:471f378eab4c
   |
   | x  0dec01379d3b
-  | |    Obsfate: folded using fold as 3:eb5a0daa2192
+  | |    Obsfate: rewritten using fold as 3:eb5a0daa2192
   | |
   | x  471f378eab4c
-  |/     Obsfate: folded using fold as 3:eb5a0daa2192
+  |/     Obsfate: rewritten using fold as 3:eb5a0daa2192
   |
   o  ea207398892e
   
@@ -834,7 +836,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
@@ -846,7 +848,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
@@ -867,21 +869,21 @@
   o  eb5a0daa2192
   |    Predecessors: 1:471f378eab4c
   |    semi-colon: 1:471f378eab4c
-  |    Origin: folded using fold from 1:471f378eab4c
+  |    Origin: rewritten using fold from 1:471f378eab4c
   |
   | @  471f378eab4c
   |/     Successors: 4:eb5a0daa2192
   |      semi-colon: 4:eb5a0daa2192
-  |      Fate: folded using fold as 4:eb5a0daa2192
+  |      Fate: rewritten using fold as 4:eb5a0daa2192
   |
   o  ea207398892e
   
   $ hg fateoriginlog
   o  eb5a0daa2192
-  |    Obsorigin: folded using fold from 1:471f378eab4c
+  |    Obsorigin: rewritten using fold from 1:471f378eab4c
   |
   | @  471f378eab4c
-  |/     Obsfate: folded using fold as 4:eb5a0daa2192
+  |/     Obsfate: rewritten using fold as 4:eb5a0daa2192
   |
   o  ea207398892e
   
@@ -895,7 +897,8 @@
   o  eb5a0daa2192
   |    Predecessors: 2:0dec01379d3b 1:471f378eab4c
   |    semi-colon: 2:0dec01379d3b; 1:471f378eab4c
-  |    Origin: folded using amend, fold from 1:471f378eab4c, 2:0dec01379d3b
+  |    Origin: rewritten using amend, fold from 2:0dec01379d3b
+  |    Origin: rewritten using fold from 1:471f378eab4c
   |
   | @  0dec01379d3b
   | |    Successors: 4:eb5a0daa2192
@@ -905,19 +908,19 @@
   | x  471f378eab4c
   |/     Successors: 4:eb5a0daa2192
   |      semi-colon: 4:eb5a0daa2192
-  |      Fate: folded using fold as 4:eb5a0daa2192
+  |      Fate: rewritten using fold as 4:eb5a0daa2192
   |
   o  ea207398892e
   
   $ hg fateoriginlog
   o  eb5a0daa2192
-  |    Obsorigin: folded using amend, fold from 1:471f378eab4c, 2:0dec01379d3b
+  |    Obsorigin: rewritten using amend, fold from 2:0dec01379d3b; rewritten using fold from 1:471f378eab4c
   |
   | @  0dec01379d3b
   | |    Obsfate: rewritten using amend, fold as 4:eb5a0daa2192
   | |
   | x  471f378eab4c
-  |/     Obsfate: folded using fold as 4:eb5a0daa2192
+  |/     Obsfate: rewritten using fold as 4:eb5a0daa2192
   |
   o  ea207398892e
   
@@ -932,29 +935,30 @@
   o  eb5a0daa2192
   |    Predecessors: 1:471f378eab4c 3:b7ea6d14e664
   |    semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
-  |    Origin: folded using fold from 1:471f378eab4c, 3:b7ea6d14e664
+  |    Origin: rewritten using fold from 1:471f378eab4c
+  |    Origin: rewritten using fold from 3:b7ea6d14e664
   |
   | @  b7ea6d14e664
   | |    Successors: 4:eb5a0daa2192
   | |    semi-colon: 4:eb5a0daa2192
-  | |    Fate: folded using fold as 4:eb5a0daa2192
+  | |    Fate: rewritten using fold as 4:eb5a0daa2192
   | |
   | x  471f378eab4c
   |/     Successors: 4:eb5a0daa2192
   |      semi-colon: 4:eb5a0daa2192
-  |      Fate: folded using fold as 4:eb5a0daa2192
+  |      Fate: rewritten using fold as 4:eb5a0daa2192
   |
   o  ea207398892e
   
   $ hg fateoriginlog
   o  eb5a0daa2192
-  |    Obsorigin: folded using fold from 1:471f378eab4c, 3:b7ea6d14e664
+  |    Obsorigin: rewritten using fold from 1:471f378eab4c; rewritten using fold from 3:b7ea6d14e664
   |
   | @  b7ea6d14e664
-  | |    Obsfate: folded using fold as 4:eb5a0daa2192
+  | |    Obsfate: rewritten using fold as 4:eb5a0daa2192
   | |
   | x  471f378eab4c
-  |/     Obsfate: folded using fold as 4:eb5a0daa2192
+  |/     Obsfate: rewritten using fold as 4:eb5a0daa2192
   |
   o  ea207398892e
   
@@ -970,14 +974,15 @@
   @  eb5a0daa2192
   |    Predecessors: 1:471f378eab4c 3:b7ea6d14e664
   |    semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
-  |    Origin: folded using fold from 1:471f378eab4c, 3:b7ea6d14e664
+  |    Origin: rewritten using fold from 1:471f378eab4c
+  |    Origin: rewritten using fold from 3:b7ea6d14e664
   |
   | x  b7ea6d14e664
   | |    Predecessors: 2:0dec01379d3b
   | |    semi-colon: 2:0dec01379d3b
   | |    Successors: 4:eb5a0daa2192
   | |    semi-colon: 4:eb5a0daa2192
-  | |    Fate: folded using fold as 4:eb5a0daa2192
+  | |    Fate: rewritten using fold as 4:eb5a0daa2192
   | |    Origin: reworded using amend from 2:0dec01379d3b
   | |
   | | x  0dec01379d3b
@@ -988,23 +993,23 @@
   | x  471f378eab4c
   |/     Successors: 4:eb5a0daa2192
   |      semi-colon: 4:eb5a0daa2192
-  |      Fate: folded using fold as 4:eb5a0daa2192
+  |      Fate: rewritten using fold as 4:eb5a0daa2192
   |
   o  ea207398892e
   
   $ hg fateoriginlog --hidden
   @  eb5a0daa2192
-  |    Obsorigin: folded using fold from 1:471f378eab4c, 3:b7ea6d14e664
+  |    Obsorigin: rewritten using fold from 1:471f378eab4c; rewritten using fold from 3:b7ea6d14e664
   |
   | x  b7ea6d14e664
-  | |    Obsfate: folded using fold as 4:eb5a0daa2192
+  | |    Obsfate: rewritten using fold as 4:eb5a0daa2192
   | |    Obsorigin: reworded using amend from 2:0dec01379d3b
   | |
   | | x  0dec01379d3b
   | |/     Obsfate: reworded using amend as 3:b7ea6d14e664
   | |
   | x  471f378eab4c
-  |/     Obsfate: folded using fold as 4:eb5a0daa2192
+  |/     Obsfate: rewritten using fold as 4:eb5a0daa2192
   |
   o  ea207398892e
   
@@ -1074,7 +1079,7 @@
   added 1 changesets with 0 changes to 1 files (+1 heads)
   2 new obsolescence markers
   obsoleted 1 changesets
-  new changesets 7a230b46bf61 (1 drafts)
+  new changesets 7a230b46bf61
   (run 'hg heads' to see heads, 'hg merge' to merge)
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: 7a230b46bf61)
@@ -1721,8 +1726,8 @@
   $ hg prune -r 'desc(C)' -s 'desc(Z)'
   1 changesets pruned
   $ hg debugobsolete
-  944ade52b6a1afe01817e7cae4c3006f1f128279 4568aafd15c0ac96a9828ce8418556bb1e76d6d7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'fold-id': 'c59cbeaa', 'fold-idx': '1', 'fold-size': '2', 'operation': 'prune', 'user': 'test'}
-  36ca49338d3a303e90126c28b1713092aaf3e9ed 4568aafd15c0ac96a9828ce8418556bb1e76d6d7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'fold-id': 'c59cbeaa', 'fold-idx': '2', 'fold-size': '2', 'operation': 'prune', 'user': 'test'}
+  944ade52b6a1afe01817e7cae4c3006f1f128279 4568aafd15c0ac96a9828ce8418556bb1e76d6d7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'}
+  36ca49338d3a303e90126c28b1713092aaf3e9ed 4568aafd15c0ac96a9828ce8418556bb1e76d6d7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'prune', 'user': 'test'}
   5b3370228fe5fa9824b8df21cd54876ef23ac745 4568aafd15c0ac96a9828ce8418556bb1e76d6d7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'prune', 'user': 'test'}
   $ hg tlog
   o  4568aafd15c0
@@ -1733,8 +1738,9 @@
   o  4568aafd15c0
   |    Predecessors: 2:36ca49338d3a 3:5b3370228fe5 1:944ade52b6a1
   |    semi-colon: 2:36ca49338d3a; 3:5b3370228fe5; 1:944ade52b6a1
-  |    Origin: folded using prune from 1:944ade52b6a1, 2:36ca49338d3a
+  |    Origin: rewritten using prune from 2:36ca49338d3a
   |    Origin: rewritten using prune from 3:5b3370228fe5
+  |    Origin: rewritten using prune from 1:944ade52b6a1
   |
   | x  5b3370228fe5
   |/     Successors: 4:4568aafd15c0
@@ -1744,12 +1750,12 @@
   | x  36ca49338d3a
   | |    Successors: 4:4568aafd15c0
   | |    semi-colon: 4:4568aafd15c0
-  | |    Fate: folded using prune as 4:4568aafd15c0
+  | |    Fate: rewritten using prune as 4:4568aafd15c0
   | |
   | x  944ade52b6a1
   |/     Successors: 4:4568aafd15c0
   |      semi-colon: 4:4568aafd15c0
-  |      Fate: folded using prune as 4:4568aafd15c0
+  |      Fate: rewritten using prune as 4:4568aafd15c0
   |
   @  7ca5bfdbe243