diff -r 9db99aee4b87 -r 663dbef40f97 tests/test-evolve-templates.t
--- a/tests/test-evolve-templates.t	Fri Oct 20 22:31:07 2017 +0200
+++ b/tests/test-evolve-templates.t	Fri Oct 20 22:44:12 2017 +0200
@@ -47,13 +47,13 @@
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as 3:d004c8f274b9 by test2
+  |    obsolete:    reworded using amend as 3:d004c8f274b9 by test2
   |    summary:     A1
   |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as 2:a468dc9b3633
+  |    obsolete:    rewritten using amend as 2:a468dc9b3633
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -85,7 +85,7 @@
   | @  471f378eab4c
   |/     Successors: 3:d004c8f274b9
   |      semi-colon: 3:d004c8f274b9
-  |      Fate: rewritten as 3:d004c8f274b9 by test, test2
+  |      Fate: rewritten using amend as 3:d004c8f274b9 by test, test2
   |
   o  ea207398892e
   
@@ -101,7 +101,7 @@
   | @  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    rewritten as 3:d004c8f274b9 by test, test2
+  |    obsolete:    rewritten using amend as 3:d004c8f274b9 by test, test2
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -114,7 +114,7 @@
   o  d004c8f274b9
   |
   | @  471f378eab4c
-  |/     Obsfate: rewritten as 3:d004c8f274b9
+  |/     Obsfate: rewritten using amend as 3:d004c8f274b9
   |
   o  ea207398892e
   
@@ -123,7 +123,7 @@
   o  d004c8f274b9
   |
   | @  471f378eab4c
-  |/     Obsfate: rewritten as 3:d004c8f274b9 by test, test2
+  |/     Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2
   |
   o  ea207398892e
   
@@ -131,7 +131,7 @@
   o  d004c8f274b9
   |
   | @  471f378eab4c
-  |/     Obsfate: rewritten as 3:d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000)
+  |/     Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000)
   |
   o  ea207398892e
   
@@ -167,7 +167,7 @@
   | @  a468dc9b3633
   |/     Successors: 3:d004c8f274b9
   |      semi-colon: 3:d004c8f274b9
-  |      Fate: reworded as 3:d004c8f274b9 by test2
+  |      Fate: reworded using amend as 3:d004c8f274b9 by test2
   |
   o  ea207398892e
   
@@ -182,12 +182,12 @@
   |      semi-colon: 1:471f378eab4c
   |      Successors: 3:d004c8f274b9
   |      semi-colon: 3:d004c8f274b9
-  |      Fate: reworded as 3:d004c8f274b9 by test2
+  |      Fate: reworded using amend as 3:d004c8f274b9 by test2
   |
   | x  471f378eab4c
   |/     Successors: 2:a468dc9b3633
   |      semi-colon: 2:a468dc9b3633
-  |      Fate: rewritten as 2:a468dc9b3633
+  |      Fate: rewritten using amend as 2:a468dc9b3633
   |
   o  ea207398892e
   
@@ -195,7 +195,7 @@
   o  d004c8f274b9
   |
   | @  a468dc9b3633
-  |/     Obsfate: reworded as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
+  |/     Obsfate: reworded using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
   |
   o  ea207398892e
   
@@ -215,12 +215,12 @@
   |      semi-colon: 1:471f378eab4c
   |      Successors: 3:d004c8f274b9
   |      semi-colon: 3:d004c8f274b9
-  |      Fate: reworded as 3:d004c8f274b9 by test2
+  |      Fate: reworded using amend as 3:d004c8f274b9 by test2
   |
   | x  471f378eab4c
   |/     Successors: 2:a468dc9b3633
   |      semi-colon: 2:a468dc9b3633
-  |      Fate: rewritten as 2:a468dc9b3633
+  |      Fate: rewritten using amend as 2:a468dc9b3633
   |
   o  ea207398892e
   
@@ -234,10 +234,10 @@
   @  d004c8f274b9
   |
   | x  a468dc9b3633
-  |/     Obsfate: reworded as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
+  |/     Obsfate: reworded using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
   |
   | x  471f378eab4c
-  |/     Obsfate: rewritten as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
+  |/     Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
   |
   o  ea207398892e
   
@@ -609,7 +609,7 @@
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as 2:fdf9bde5129a
+  |    obsolete:    reworded using amend as 2:fdf9bde5129a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -642,8 +642,8 @@
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as 2:fdf9bde5129a
-  |    obsolete:    reworded as 3:65b757b745b9
+  |    obsolete:    reworded using amend as 2:fdf9bde5129a
+  |    obsolete:    reworded using amend as 3:65b757b745b9
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -672,8 +672,8 @@
   | @  471f378eab4c
   |/     Successors: 2:fdf9bde5129a; 4:019fadeab383
   |      semi-colon: 2:fdf9bde5129a; 4:019fadeab383
-  |      Fate: reworded as 2:fdf9bde5129a
-  |      Fate: reworded as 4:019fadeab383
+  |      Fate: reworded using amend as 2:fdf9bde5129a
+  |      Fate: reworded using amend as 4:019fadeab383
   |
   o  ea207398892e
   
@@ -683,7 +683,7 @@
   | o  fdf9bde5129a
   |/
   | @  471f378eab4c
-  |/     Obsfate: reworded as 2:fdf9bde5129a; reworded as 4:019fadeab383
+  |/     Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383
   |
   o  ea207398892e
   
@@ -717,7 +717,7 @@
   |      semi-colon: 1:471f378eab4c
   |      Successors: 4:019fadeab383
   |      semi-colon: 4:019fadeab383
-  |      Fate: reworded as 4:019fadeab383
+  |      Fate: reworded using amend as 4:019fadeab383
   |
   | @  fdf9bde5129a
   |/     Precursors: 1:471f378eab4c
@@ -725,8 +725,8 @@
   | x  471f378eab4c
   |/     Successors: 2:fdf9bde5129a; 3:65b757b745b9
   |      semi-colon: 2:fdf9bde5129a; 3:65b757b745b9
-  |      Fate: reworded as 2:fdf9bde5129a
-  |      Fate: reworded as 3:65b757b745b9
+  |      Fate: reworded using amend as 2:fdf9bde5129a
+  |      Fate: reworded using amend as 3:65b757b745b9
   |
   o  ea207398892e
   
@@ -734,12 +734,12 @@
   o  019fadeab383
   |
   | x  65b757b745b9
-  |/     Obsfate: reworded as 4:019fadeab383
+  |/     Obsfate: reworded using amend as 4:019fadeab383
   |
   | @  fdf9bde5129a
   |/
   | x  471f378eab4c
-  |/     Obsfate: reworded as 2:fdf9bde5129a; reworded as 3:65b757b745b9
+  |/     Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 3:65b757b745b9
   |
   o  ea207398892e
   
@@ -779,7 +779,7 @@
   | x  changeset:   2:0dec01379d3b
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as 3:b7ea6d14e664
+  |    obsolete:    reworded using amend as 3:b7ea6d14e664
   |    summary:     B0
   |
   o  changeset:   1:471f378eab4c
@@ -813,7 +813,7 @@
   | | x  changeset:   2:0dec01379d3b
   | |/   user:        test
   | |    date:        Thu Jan 01 00:00:00 1970 +0000
-  | |    obsolete:    reworded as 3:b7ea6d14e664
+  | |    obsolete:    reworded using amend as 3:b7ea6d14e664
   | |    summary:     B0
   | |
   | x  changeset:   1:471f378eab4c
@@ -864,7 +864,7 @@
   | @  0dec01379d3b
   | |    Successors: 4:eb5a0daa2192
   | |    semi-colon: 4:eb5a0daa2192
-  | |    Fate: rewritten as 4:eb5a0daa2192
+  | |    Fate: rewritten using amend as 4:eb5a0daa2192
   | |
   | x  471f378eab4c
   |/     Successors: 4:eb5a0daa2192
@@ -877,7 +877,7 @@
   o  eb5a0daa2192
   |
   | @  0dec01379d3b
-  | |    Obsfate: rewritten as 4:eb5a0daa2192
+  | |    Obsfate: rewritten using amend as 4:eb5a0daa2192
   | |
   | x  471f378eab4c
   |/     Obsfate: rewritten as 4:eb5a0daa2192
@@ -938,7 +938,7 @@
   | | x  0dec01379d3b
   | |/     Successors: 3:b7ea6d14e664
   | |      semi-colon: 3:b7ea6d14e664
-  | |      Fate: reworded as 3:b7ea6d14e664
+  | |      Fate: reworded using amend as 3:b7ea6d14e664
   | |
   | x  471f378eab4c
   |/     Successors: 4:eb5a0daa2192
@@ -954,7 +954,7 @@
   | |    Obsfate: rewritten as 4:eb5a0daa2192
   | |
   | | x  0dec01379d3b
-  | |/     Obsfate: reworded as 3:b7ea6d14e664
+  | |/     Obsfate: reworded using amend as 3:b7ea6d14e664
   | |
   | x  471f378eab4c
   |/     Obsfate: rewritten as 4:eb5a0daa2192
@@ -1014,13 +1014,13 @@
   |/   parent:      0:ea207398892e
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as 3:7a230b46bf61
+  |    obsolete:    reworded using amend as 3:7a230b46bf61
   |    summary:     A1
   |
   | x  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as 2:fdf9bde5129a
+  |    obsolete:    reworded using amend as 2:fdf9bde5129a
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -1053,7 +1053,7 @@
   | @  changeset:   1:471f378eab4c
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    obsolete:    reworded as 2:7a230b46bf61
+  |    obsolete:    reworded using amend as 2:7a230b46bf61
   |    summary:     A0
   |
   o  changeset:   0:ea207398892e
@@ -1071,7 +1071,7 @@
   | @  471f378eab4c
   |/     Successors: 2:7a230b46bf61
   |      semi-colon: 2:7a230b46bf61
-  |      Fate: reworded as 2:7a230b46bf61
+  |      Fate: reworded using amend as 2:7a230b46bf61
   |
   o  ea207398892e
   
@@ -1079,7 +1079,7 @@
   o  7a230b46bf61
   |
   | @  471f378eab4c
-  |/     Obsfate: reworded as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
+  |/     Obsfate: reworded using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
   |
   o  ea207398892e
   
@@ -1102,7 +1102,7 @@
   | x  471f378eab4c
   |/     Successors: 2:7a230b46bf61
   |      semi-colon: 2:7a230b46bf61
-  |      Fate: reworded as 2:7a230b46bf61
+  |      Fate: reworded using amend as 2:7a230b46bf61
   |
   o  ea207398892e
   
@@ -1110,7 +1110,7 @@
   @  7a230b46bf61
   |
   | x  471f378eab4c
-  |/     Obsfate: reworded as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
+  |/     Obsfate: reworded using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
   |
   o  ea207398892e