evolve: comparison tests/test-evolve-templates.t

equal deleted inserted replaced

-:d4c457c1ae0d
+:589649021ea1
 |  summary:     C0
 |
 | x  changeset:   2:0dec01379d3b
 | |  user:        test
 | |  date:        Thu Jan 01 00:00:00 1970 +0000
-| |  obsolete:    rewritten 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:    rewritten as 3:eb5a0daa2192
+|    obsolete:    rewritten using fold as 3:eb5a0daa2192
 |    summary:     A0
 |
 o  changeset:   0:ea207398892e
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 |    Precursors: 1:471f378eab4c
 |    semi-colon: 1:471f378eab4c
 | @  471f378eab4c
 |/     Successors: 3:eb5a0daa2192
 |      semi-colon: 3:eb5a0daa2192
-|      Fate: rewritten as 3:eb5a0daa2192
+|      Fate: rewritten using fold as 3:eb5a0daa2192
 |
 o  ea207398892e
 $ hg fatelog
 o  eb5a0daa2192
 |
 | @  471f378eab4c
-|/     Obsfate: rewritten as 3:eb5a0daa2192
+|/     Obsfate: rewritten using fold as 3:eb5a0daa2192
 |
 o  ea207398892e
 $ hg up 'desc(B0)' --hidden
 updating to a hidden changeset 0dec01379d3b
 |    Precursors: 2:0dec01379d3b 1:471f378eab4c
 |    semi-colon: 2:0dec01379d3b; 1:471f378eab4c
 | @  0dec01379d3b
 | |    Successors: 3:eb5a0daa2192
 | |    semi-colon: 3:eb5a0daa2192
-| |    Fate: rewritten as 3:eb5a0daa2192
+| |    Fate: rewritten using fold as 3:eb5a0daa2192
 | |
 | x  471f378eab4c
 |/     Successors: 3:eb5a0daa2192
 |      semi-colon: 3:eb5a0daa2192
-|      Fate: rewritten as 3:eb5a0daa2192
+|      Fate: rewritten using fold as 3:eb5a0daa2192
 |
 o  ea207398892e
 $ hg fatelog
 o  eb5a0daa2192
 |
 | @  0dec01379d3b
-| |    Obsfate: rewritten as 3:eb5a0daa2192
+| |    Obsfate: rewritten using fold as 3:eb5a0daa2192
 | |
 | x  471f378eab4c
-|/     Obsfate: rewritten as 3:eb5a0daa2192
+|/     Obsfate: rewritten using fold as 3:eb5a0daa2192
 |
 o  ea207398892e
 $ hg up 'desc(C0)'
 |    Precursors: 2:0dec01379d3b 1:471f378eab4c
 |    semi-colon: 2:0dec01379d3b; 1:471f378eab4c
 | x  0dec01379d3b
 | |    Successors: 3:eb5a0daa2192
 | |    semi-colon: 3:eb5a0daa2192
-| |    Fate: rewritten as 3:eb5a0daa2192
+| |    Fate: rewritten using fold as 3:eb5a0daa2192
 | |
 | x  471f378eab4c
 |/     Successors: 3:eb5a0daa2192
 |      semi-colon: 3:eb5a0daa2192
-|      Fate: rewritten as 3:eb5a0daa2192
+|      Fate: rewritten using fold as 3:eb5a0daa2192
 |
 o  ea207398892e
 $ hg fatelog --hidden
 @  eb5a0daa2192
 |
 | x  0dec01379d3b
-| |    Obsfate: rewritten as 3:eb5a0daa2192
+| |    Obsfate: rewritten using fold as 3:eb5a0daa2192
 | |
 | x  471f378eab4c
-|/     Obsfate: rewritten as 3:eb5a0daa2192
+|/     Obsfate: rewritten using fold as 3:eb5a0daa2192
 |
 o  ea207398892e
 $ hg fatelogjson --hidden
 @  eb5a0daa2192 []
 |
-| x  0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
+| x  0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["operation", "fold"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
 | |
-| x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
+| x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["operation", "fold"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
 |/
 o  ea207398892e []
 Test templates with divergence
 |
 | x  changeset:   3:b7ea6d14e664
 | |  parent:      1:471f378eab4c
 | |  user:        test
 | |  date:        Thu Jan 01 00:00:00 1970 +0000
-| |  obsolete:    rewritten as 4:eb5a0daa2192
+| |  obsolete:    rewritten using fold as 4:eb5a0daa2192
 | |  summary:     B1
 | |
 | | x  changeset:   2:0dec01379d3b
 | |/   user:        test
 | |    date:        Thu Jan 01 00:00:00 1970 +0000
 | |    summary:     B0
 | |
 | x  changeset:   1:471f378eab4c
 |/   user:        test
 |    date:        Thu Jan 01 00:00:00 1970 +0000
-|    obsolete:    rewritten as 4:eb5a0daa2192
+|    obsolete:    rewritten using fold as 4:eb5a0daa2192
 |    summary:     A0
 |
 o  changeset:   0:ea207398892e
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 |    Precursors: 1:471f378eab4c
 |    semi-colon: 1:471f378eab4c
 | @  471f378eab4c
 |/     Successors: 4:eb5a0daa2192
 |      semi-colon: 4:eb5a0daa2192
-|      Fate: rewritten as 4:eb5a0daa2192
+|      Fate: rewritten using fold as 4:eb5a0daa2192
 |
 o  ea207398892e
 $ hg fatelog
 o  eb5a0daa2192
 |
 | @  471f378eab4c
-|/     Obsfate: rewritten as 4:eb5a0daa2192
+|/     Obsfate: rewritten using fold as 4:eb5a0daa2192
 |
 o  ea207398892e
 $ hg up 'desc(B0)' --hidden
 updating to a hidden changeset 0dec01379d3b
 |    Precursors: 2:0dec01379d3b 1:471f378eab4c
 |    semi-colon: 2:0dec01379d3b; 1:471f378eab4c
 | @  0dec01379d3b
 | |    Successors: 4:eb5a0daa2192
 | |    semi-colon: 4:eb5a0daa2192
-| |    Fate: rewritten using amend as 4:eb5a0daa2192
+| |    Fate: rewritten using amend, fold as 4:eb5a0daa2192
 | |
 | x  471f378eab4c
 |/     Successors: 4:eb5a0daa2192
 |      semi-colon: 4:eb5a0daa2192
-|      Fate: rewritten as 4:eb5a0daa2192
+|      Fate: rewritten using fold as 4:eb5a0daa2192
 |
 o  ea207398892e
 $ hg fatelog
 o  eb5a0daa2192
 |
 | @  0dec01379d3b
-| |    Obsfate: rewritten using amend as 4:eb5a0daa2192
+| |    Obsfate: rewritten using amend, fold as 4:eb5a0daa2192
 | |
 | x  471f378eab4c
-|/     Obsfate: rewritten as 4:eb5a0daa2192
+|/     Obsfate: rewritten using fold as 4:eb5a0daa2192
 |
 o  ea207398892e
 $ hg up 'desc(B1)' --hidden
 |    Precursors: 1:471f378eab4c 3:b7ea6d14e664
 |    semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
 | @  b7ea6d14e664
 | |    Successors: 4:eb5a0daa2192
 | |    semi-colon: 4:eb5a0daa2192
-| |    Fate: rewritten as 4:eb5a0daa2192
+| |    Fate: rewritten using fold as 4:eb5a0daa2192
 | |
 | x  471f378eab4c
 |/     Successors: 4:eb5a0daa2192
 |      semi-colon: 4:eb5a0daa2192
-|      Fate: rewritten as 4:eb5a0daa2192
+|      Fate: rewritten using fold as 4:eb5a0daa2192
 |
 o  ea207398892e
 $ hg fatelog
 o  eb5a0daa2192
 |
 | @  b7ea6d14e664
-| |    Obsfate: rewritten as 4:eb5a0daa2192
+| |    Obsfate: rewritten using fold as 4:eb5a0daa2192
 | |
 | x  471f378eab4c
-|/     Obsfate: rewritten as 4:eb5a0daa2192
+|/     Obsfate: rewritten using fold as 4:eb5a0daa2192
 |
 o  ea207398892e
 $ hg up 'desc(C0)'
 | x  b7ea6d14e664
 | |    Precursors: 2:0dec01379d3b
 | |    semi-colon: 2:0dec01379d3b
 | |    Successors: 4:eb5a0daa2192
 | |    semi-colon: 4:eb5a0daa2192
-| |    Fate: rewritten as 4:eb5a0daa2192
+| |    Fate: rewritten using fold as 4:eb5a0daa2192
 | |
 | | x  0dec01379d3b
 | |/     Successors: 3:b7ea6d14e664
 | |      semi-colon: 3:b7ea6d14e664
 | |      Fate: reworded using amend as 3:b7ea6d14e664
 | |
 | x  471f378eab4c
 |/     Successors: 4:eb5a0daa2192
 |      semi-colon: 4:eb5a0daa2192
-|      Fate: rewritten as 4:eb5a0daa2192
+|      Fate: rewritten using fold as 4:eb5a0daa2192
 |
 o  ea207398892e
 $ hg fatelog --hidden
 @  eb5a0daa2192
 |
 | x  b7ea6d14e664
-| |    Obsfate: rewritten as 4:eb5a0daa2192
+| |    Obsfate: rewritten using fold as 4:eb5a0daa2192
 | |
 | | x  0dec01379d3b
 | |/     Obsfate: reworded using amend as 3:b7ea6d14e664
 | |
 | x  471f378eab4c
-|/     Obsfate: rewritten as 4:eb5a0daa2192
+|/     Obsfate: rewritten using fold as 4:eb5a0daa2192
 |
 o  ea207398892e
 $ hg fatelogjson --hidden
 @  eb5a0daa2192 []
 |
-| x  b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
+| x  b7ea6d14e664 [{"markers": [["b7ea6d14e664bdc8922221f7992631b50da3fb07", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "13"], ["operation", "fold"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
 | |
 | | x  0dec01379d3b [{"markers": [["0dec01379d3be6318c470ead31b1fe7ae7cb53d5", ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], 0, [["ef1", "1"], ["operation", "amend"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["b7ea6d14e664bdc8922221f7992631b50da3fb07"], "users": ["test"], "verb": "reworded"}]
 | |/
-| x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
+| x  471f378eab4c [{"markers": [["471f378eab4c5e25f6c77f785b27c936efb22874", ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], 0, [["ef1", "9"], ["operation", "fold"], ["user", "test"]], [0.0, 0], null]], "max_date": [0.0, 0], "min_date": [0.0, 0], "successors": ["eb5a0daa21923bbf8caeb2c42085b9e463861fd0"], "users": ["test"], "verb": "rewritten"}]
 |/
 o  ea207398892e []
 Test template with pushed and pulled obs markers

changeset 3564	589649021ea1
parent 3520	1f0c88a9dd1c
child 3566	e6bea259c227