diff -r a9f9edb168a1 -r e8660b28bfee tests/test-evolve-content-divergent-basic.t
--- a/tests/test-evolve-content-divergent-basic.t	Thu May 07 01:29:24 2020 +0200
+++ b/tests/test-evolve-content-divergent-basic.t	Thu May 07 01:29:48 2020 +0200
@@ -900,61 +900,61 @@
   4a250e5bd992a897655e3b6f238e12452cf063e9 19ed1bf64a2cc2a824df5ac33a436eca1ae0475d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
   $ hg obslog --all --patch
   *  084ae625fa51 (2) E2
+  |    rewritten(description, content) from 4a250e5bd992 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |      diff -r 4a250e5bd992 -r 084ae625fa51 changeset-description
+  |      --- a/changeset-description
+  |      +++ b/changeset-description
+  |      @@ -1,1 +1,1 @@
+  |      -E1
+  |      +E2
+  |
+  |      diff --git a/numbers b/numbers
+  |      --- a/numbers
+  |      +++ b/numbers
+  |      @@ -4,1 +4,1 @@
+  |      -four
+  |      +4
+  |      @@ -7,1 +7,1 @@
+  |      -7
+  |      +seven
+  |      diff --git a/romans b/romans
+  |      --- a/romans
+  |      +++ b/romans
+  |      @@ -6,1 +6,1 @@
+  |      -VI
+  |      +vi
+  |
   |
   | @  19ed1bf64a2c (3) E3
-  |/
+  |/     rewritten(description, content) from 4a250e5bd992 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |        diff -r 4a250e5bd992 -r 19ed1bf64a2c changeset-description
+  |        --- a/changeset-description
+  |        +++ b/changeset-description
+  |        @@ -1,1 +1,1 @@
+  |        -E1
+  |        +E3
+  |
+  |        diff --git a/letters b/letters
+  |        --- a/letters
+  |        +++ b/letters
+  |        @@ -4,1 +4,1 @@
+  |        -D
+  |        +d
+  |        diff --git a/numbers b/numbers
+  |        --- a/numbers
+  |        +++ b/numbers
+  |        @@ -1,1 +1,1 @@
+  |        -1
+  |        +one
+  |        diff --git a/romans b/romans
+  |        --- a/romans
+  |        +++ b/romans
+  |        @@ -2,1 +2,1 @@
+  |        -II
+  |        +ii
+  |
+  |
   x  4a250e5bd992 (1) E1
-       rewritten(description, content) as 084ae625fa51 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
-         diff -r 4a250e5bd992 -r 084ae625fa51 changeset-description
-         --- a/changeset-description
-         +++ b/changeset-description
-         @@ -1,1 +1,1 @@
-         -E1
-         +E2
-  
-         diff --git a/numbers b/numbers
-         --- a/numbers
-         +++ b/numbers
-         @@ -4,1 +4,1 @@
-         -four
-         +4
-         @@ -7,1 +7,1 @@
-         -7
-         +seven
-         diff --git a/romans b/romans
-         --- a/romans
-         +++ b/romans
-         @@ -6,1 +6,1 @@
-         -VI
-         +vi
-  
-       rewritten(description, content) as 19ed1bf64a2c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
-         diff -r 4a250e5bd992 -r 19ed1bf64a2c changeset-description
-         --- a/changeset-description
-         +++ b/changeset-description
-         @@ -1,1 +1,1 @@
-         -E1
-         +E3
-  
-         diff --git a/letters b/letters
-         --- a/letters
-         +++ b/letters
-         @@ -4,1 +4,1 @@
-         -D
-         +d
-         diff --git a/numbers b/numbers
-         --- a/numbers
-         +++ b/numbers
-         @@ -1,1 +1,1 @@
-         -1
-         +one
-         diff --git a/romans b/romans
-         --- a/romans
-         +++ b/romans
-         @@ -2,1 +2,1 @@
-         -II
-         +ii
-  
   
 
   $ hg evolve --content-divergent --rev 'desc("E3")'
@@ -1007,22 +1007,20 @@
   e7cb08a7241a98c908db298b61fc033b27f648c7 50bb00cad3206c79d231a621e319772302a88d8d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
   $ hg obslog --patch
   @  50bb00cad320 (5) E4
+  |    reworded(description) from e7cb08a7241a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |      diff -r e7cb08a7241a -r 50bb00cad320 changeset-description
+  |      --- a/changeset-description
+  |      +++ b/changeset-description
+  |      @@ -1,4 +1,1 @@
+  |      -<<<<<<< divergent
+  |      -E2||||||| base
+  |      -E1=======
+  |      -E3>>>>>>> other
+  |      +E4
+  |
   |
   x    e7cb08a7241a (4) <<<<<<< divergent
-  |\     reworded(description) as 50bb00cad320 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
-  | |      diff -r e7cb08a7241a -r 50bb00cad320 changeset-description
-  | |      --- a/changeset-description
-  | |      +++ b/changeset-description
-  | |      @@ -1,4 +1,1 @@
-  | |      -<<<<<<< divergent
-  | |      -E2||||||| base
-  | |      -E1=======
-  | |      -E3>>>>>>> other
-  | |      +E4
-  | |
-  | |
-  x |  084ae625fa51 (2) E2
-  | |    rewritten(description, content) as e7cb08a7241a using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  |\     rewritten(description, content) from 084ae625fa51 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
   | |      diff -r 084ae625fa51 -r e7cb08a7241a changeset-description
   | |      --- a/changeset-description
   | |      +++ b/changeset-description
@@ -1052,86 +1050,89 @@
   | |      -II
   | |      +ii
   | |
+  | |    rewritten(description, content) from 19ed1bf64a2c using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |      diff -r 19ed1bf64a2c -r e7cb08a7241a changeset-description
+  | |      --- a/changeset-description
+  | |      +++ b/changeset-description
+  | |      @@ -1,1 +1,4 @@
+  | |      -E3
+  | |      +<<<<<<< divergent
+  | |      +E2||||||| base
+  | |      +E1=======
+  | |      +E3>>>>>>> other
+  | |
+  | |      diff --git a/numbers b/numbers
+  | |      --- a/numbers
+  | |      +++ b/numbers
+  | |      @@ -4,1 +4,1 @@
+  | |      -four
+  | |      +4
+  | |      @@ -7,1 +7,1 @@
+  | |      -7
+  | |      +seven
+  | |      diff --git a/romans b/romans
+  | |      --- a/romans
+  | |      +++ b/romans
+  | |      @@ -6,1 +6,1 @@
+  | |      -VI
+  | |      +vi
+  | |
+  | |
+  x |  084ae625fa51 (2) E2
+  | |    rewritten(description, content) from 4a250e5bd992 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  | |      diff -r 4a250e5bd992 -r 084ae625fa51 changeset-description
+  | |      --- a/changeset-description
+  | |      +++ b/changeset-description
+  | |      @@ -1,1 +1,1 @@
+  | |      -E1
+  | |      +E2
+  | |
+  | |      diff --git a/numbers b/numbers
+  | |      --- a/numbers
+  | |      +++ b/numbers
+  | |      @@ -4,1 +4,1 @@
+  | |      -four
+  | |      +4
+  | |      @@ -7,1 +7,1 @@
+  | |      -7
+  | |      +seven
+  | |      diff --git a/romans b/romans
+  | |      --- a/romans
+  | |      +++ b/romans
+  | |      @@ -6,1 +6,1 @@
+  | |      -VI
+  | |      +vi
+  | |
   | |
   | x  19ed1bf64a2c (3) E3
-  |/     rewritten(description, content) as e7cb08a7241a using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
-  |        diff -r 19ed1bf64a2c -r e7cb08a7241a changeset-description
+  |/     rewritten(description, content) from 4a250e5bd992 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
+  |        diff -r 4a250e5bd992 -r 19ed1bf64a2c changeset-description
   |        --- a/changeset-description
   |        +++ b/changeset-description
-  |        @@ -1,1 +1,4 @@
-  |        -E3
-  |        +<<<<<<< divergent
-  |        +E2||||||| base
-  |        +E1=======
-  |        +E3>>>>>>> other
+  |        @@ -1,1 +1,1 @@
+  |        -E1
+  |        +E3
   |
+  |        diff --git a/letters b/letters
+  |        --- a/letters
+  |        +++ b/letters
+  |        @@ -4,1 +4,1 @@
+  |        -D
+  |        +d
   |        diff --git a/numbers b/numbers
   |        --- a/numbers
   |        +++ b/numbers
-  |        @@ -4,1 +4,1 @@
-  |        -four
-  |        +4
-  |        @@ -7,1 +7,1 @@
-  |        -7
-  |        +seven
+  |        @@ -1,1 +1,1 @@
+  |        -1
+  |        +one
   |        diff --git a/romans b/romans
   |        --- a/romans
   |        +++ b/romans
-  |        @@ -6,1 +6,1 @@
-  |        -VI
-  |        +vi
+  |        @@ -2,1 +2,1 @@
+  |        -II
+  |        +ii
   |
   |
   x  4a250e5bd992 (1) E1
-       rewritten(description, content) as 084ae625fa51 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
-         diff -r 4a250e5bd992 -r 084ae625fa51 changeset-description
-         --- a/changeset-description
-         +++ b/changeset-description
-         @@ -1,1 +1,1 @@
-         -E1
-         +E2
   
-         diff --git a/numbers b/numbers
-         --- a/numbers
-         +++ b/numbers
-         @@ -4,1 +4,1 @@
-         -four
-         +4
-         @@ -7,1 +7,1 @@
-         -7
-         +seven
-         diff --git a/romans b/romans
-         --- a/romans
-         +++ b/romans
-         @@ -6,1 +6,1 @@
-         -VI
-         +vi
-  
-       rewritten(description, content) as 19ed1bf64a2c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
-         diff -r 4a250e5bd992 -r 19ed1bf64a2c changeset-description
-         --- a/changeset-description
-         +++ b/changeset-description
-         @@ -1,1 +1,1 @@
-         -E1
-         +E3
-  
-         diff --git a/letters b/letters
-         --- a/letters
-         +++ b/letters
-         @@ -4,1 +4,1 @@
-         -D
-         +d
-         diff --git a/numbers b/numbers
-         --- a/numbers
-         +++ b/numbers
-         @@ -1,1 +1,1 @@
-         -1
-         +one
-         diff --git a/romans b/romans
-         --- a/romans
-         +++ b/romans
-         @@ -2,1 +2,1 @@
-         -II
-         +ii
-  
-  
+