--- a/tests/test-evolve-templates.t	Wed Aug 09 13:21:44 2017 +0200
+++ b/tests/test-evolve-templates.t	Wed Aug 09 16:01:20 2017 +0200
@@ -79,10 +79,10 @@
   o  d004c8f274b9 (4) A2
   |
   x  a468dc9b3633 (3) A1
-  |    rewritten(description) by test2 (Thu Apr 19 04:25:21 2001 +0000) as d004c8f274b9
+  |    rewritten(description) as d004c8f274b9 by test2 (Thu Apr 19 04:25:21 2001 +0000)
   |
   @  471f378eab4c (1) A0
-       rewritten(description, content) by test1 (Fri Feb 13 23:31:30 2009 +0000) as a468dc9b3633
+       rewritten(description, content) as a468dc9b3633 by test1 (Fri Feb 13 23:31:30 2009 +0000)
   
   $ hg tlog
   o  d004c8f274b9
@@ -91,7 +91,7 @@
   | @  471f378eab4c
   |/     Successors: [d004c8f274b9]
   |      semi-colon: [d004c8f274b9]
-  |      Fate: rewritten by test1, test2 as d004c8f274b9
+  |      Fate: rewritten as d004c8f274b9 by test1, test2
   |
   o  ea207398892e
   
@@ -108,7 +108,7 @@
   o  d004c8f274b9
   |
   | @  471f378eab4c
-  |/     Obsfate: rewritten by test1, test2 as d004c8f274b9
+  |/     Obsfate: rewritten as d004c8f274b9 by test1, test2
   |
   o  ea207398892e
   
@@ -116,7 +116,7 @@
   o  d004c8f274b9
   |
   | @  471f378eab4c
-  |/     Obsfate: rewritten by test1, test2 as d004c8f274b9 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000)
+  |/     Obsfate: rewritten as d004c8f274b9 by test1, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000)
   |
   o  ea207398892e
   
@@ -152,7 +152,7 @@
   | @  a468dc9b3633
   |/     Successors: [d004c8f274b9]
   |      semi-colon: [d004c8f274b9]
-  |      Fate: rewritten by test2 as d004c8f274b9
+  |      Fate: rewritten as d004c8f274b9 by test2
   |
   o  ea207398892e
   
@@ -167,7 +167,7 @@
   |      semi-colon: 471f378eab4c
   |      Successors: [d004c8f274b9]
   |      semi-colon: [d004c8f274b9]
-  |      Fate: rewritten by test2 as d004c8f274b9
+  |      Fate: rewritten as d004c8f274b9 by test2
   |
   | x  f137d23bb3e1
   | |    Fate: pruned by test1
@@ -175,7 +175,7 @@
   | x  471f378eab4c
   |/     Successors: [a468dc9b3633]
   |      semi-colon: [a468dc9b3633]
-  |      Fate: rewritten by test1 as a468dc9b3633
+  |      Fate: rewritten as a468dc9b3633 by test1
   |
   o  ea207398892e
   
@@ -183,7 +183,7 @@
   o  d004c8f274b9
   |
   | @  a468dc9b3633
-  |/     Obsfate: rewritten by test2 as d004c8f274b9 (at 2001-04-19 04:25 +0000)
+  |/     Obsfate: rewritten as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
   |
   o  ea207398892e
   
@@ -203,7 +203,7 @@
   |      semi-colon: 471f378eab4c
   |      Successors: [d004c8f274b9]
   |      semi-colon: [d004c8f274b9]
-  |      Fate: rewritten by test2 as d004c8f274b9
+  |      Fate: rewritten as d004c8f274b9 by test2
   |
   | x  f137d23bb3e1
   | |    Fate: pruned by test1
@@ -211,7 +211,7 @@
   | x  471f378eab4c
   |/     Successors: [a468dc9b3633]
   |      semi-colon: [a468dc9b3633]
-  |      Fate: rewritten by test1 as a468dc9b3633
+  |      Fate: rewritten as a468dc9b3633 by test1
   |
   o  ea207398892e
   
@@ -225,13 +225,13 @@
   @  d004c8f274b9
   |
   | x  a468dc9b3633
-  |/     Obsfate: rewritten by test2 as d004c8f274b9 (at 2001-04-19 04:25 +0000)
+  |/     Obsfate: rewritten as d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
   |
   | x  f137d23bb3e1
   | |    Obsfate: pruned by test1 (at 2009-02-13 23:31 +0000)
   | |
   | x  471f378eab4c
-  |/     Obsfate: rewritten by test1 as a468dc9b3633 (at 2009-02-13 23:31 +0000)
+  |/     Obsfate: rewritten as a468dc9b3633 by test1 (at 2009-02-13 23:31 +0000)
   |
   o  ea207398892e
   
@@ -1074,7 +1074,7 @@
   o  7a230b46bf61
   |
   | @  471f378eab4c
-  |/     Obsfate: rewritten by test as 7a230b46bf61 (at 1970-01-01 00:00 +0000)
+  |/     Obsfate: rewritten as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
   |
   o  ea207398892e
   
@@ -1105,7 +1105,7 @@
   @  7a230b46bf61
   |
   | x  471f378eab4c
-  |/     Obsfate: rewritten by test as 7a230b46bf61 (at 1970-01-01 00:00 +0000)
+  |/     Obsfate: rewritten as 7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
   |
   o  ea207398892e