diff -r 0471b9ddd0b2 -r 844b1ad5b34b tests/test-evolve-content-divergent-basic.t
--- a/tests/test-evolve-content-divergent-basic.t	Wed Apr 08 01:17:01 2020 +0800
+++ b/tests/test-evolve-content-divergent-basic.t	Fri May 08 22:50:09 2020 +0800
@@ -142,9 +142,9 @@
   with: [3] divergent
   base: [1] added b
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at 45bf1312f454
+  working directory is now at 98ab969ac8fb
   $ hg log -G
-  @  4:45bf1312f454@default(draft) divergent []
+  @  4:98ab969ac8fb@default(draft) divergent []
   |
   o  0:9092f1db7931@default(draft) added a []
   
@@ -153,7 +153,7 @@
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 45bf1312f45468b76158b33f8426e6530c8b35b1
+  # Node ID 98ab969ac8fbe315e6d2c24a8eb5eab5b81e4242
   # Parent  9092f1db7931481f93b37d5c9fbcfc341bcd7318
   divergent
   
@@ -240,10 +240,10 @@
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   content divergent changesets on different branches.
   choose branch for the resolution changeset. (a) default or (b) watwat or (c) foobar?  c
-  working directory is now at 0ac42f1bc15c
+  working directory is now at 15ee7f765bf7
 
   $ hg glog
-  @  7:0ac42f1bc15c added d
+  @  7:15ee7f765bf7 added d
   |   () [foobar] draft
   o  3:ca1b80f7960a added c
   |   () [default] draft
@@ -269,14 +269,14 @@
   $ echo bar > d
   $ hg ci -Aqm "added a d with bar in it, expect some beers"
 
-  $ hg prune -r 0ac42f1bc15c -s . --hidden
+  $ hg prune -r 'predecessors(desc("added d") - obsolete())' -s . --hidden
   1 changesets pruned
   2 new content-divergent changesets
 
   $ hg glog
   @  9:59081c9c425a added a d with bar in it, expect some beers
   |   () [default] draft
-  | *  8:f621d00f5f0e added d
+  | *  8:e6f07f2f33a9 added d
   |/    () [foobar] draft
   o  3:ca1b80f7960a added c
   |   () [default] draft
@@ -292,10 +292,10 @@
   with: [8] added d
   base: [7] added d
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory is now at a9d6fd6b5e40
+  working directory is now at 34e78e1673c1
 
   $ hg glog
-  @  10:a9d6fd6b5e40 added a d with bar in it, expect some beers
+  @  10:34e78e1673c1 added a d with bar in it, expect some beers
   |   () [default] draft
   o  3:ca1b80f7960a added c
   |   () [default] draft
@@ -311,20 +311,20 @@
   $ echo foo > d
   $ hg amend -m "foo to d"
 
-  $ hg up a9d6fd6b5e40 --hidden
-  updating to a hidden changeset a9d6fd6b5e40
-  (hidden revision 'a9d6fd6b5e40' was rewritten as: b10b07a394f1)
+  $ hg up 'predecessors(.)' --hidden
+  updating to a hidden changeset 34e78e1673c1
+  (hidden revision '34e78e1673c1' was rewritten as: c9d0d72972b0)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory parent is obsolete! (a9d6fd6b5e40)
-  (use 'hg evolve' to update to its successor: b10b07a394f1)
+  working directory parent is obsolete! (34e78e1673c1)
+  (use 'hg evolve' to update to its successor: c9d0d72972b0)
   $ echo babar > d
   $ hg amend -m "foo to d"
   2 new content-divergent changesets
 
   $ hg glog
-  @  12:0bb497fed24a foo to d
+  @  12:b4dadb3b47a7 foo to d
   |   () [default] draft
-  | *  11:b10b07a394f1 foo to d
+  | *  11:c9d0d72972b0 foo to d
   |/    () [default] draft
   o  3:ca1b80f7960a added c
   |   () [default] draft
@@ -351,10 +351,10 @@
   (no more unresolved files)
   continue: hg evolve --continue
   $ hg evolve --continue
-  working directory is now at 11175423b5dc
+  working directory is now at cfd599de811a
 
   $ hg glog
-  @  13:11175423b5dc foo to d
+  @  13:cfd599de811a foo to d
   |   () [default] draft
   o  3:ca1b80f7960a added c
   |   () [default] draft
@@ -371,20 +371,20 @@
   $ echo bar > d
   $ hg amend -m "bar to d, expect beers"
 
-  $ hg up 11175423b5dc --hidden
-  updating to a hidden changeset 11175423b5dc
-  (hidden revision '11175423b5dc' was rewritten as: 27f0463f169a)
+  $ hg up 'predecessors(.)' --hidden
+  updating to a hidden changeset cfd599de811a
+  (hidden revision 'cfd599de811a' was rewritten as: ba0941ffb747)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-  working directory parent is obsolete! (11175423b5dc)
-  (use 'hg evolve' to update to its successor: 27f0463f169a)
+  working directory parent is obsolete! (cfd599de811a)
+  (use 'hg evolve' to update to its successor: ba0941ffb747)
   $ echo wat > d
   $ hg amend -m "wat to d, wat?"
   2 new content-divergent changesets
 
   $ hg glog
-  @  15:f542037ddf31 wat to d, wat?
+  @  15:4127dd63df67 wat to d, wat?
   |   () [default] draft
-  | *  14:27f0463f169a bar to d, expect beers
+  | *  14:ba0941ffb747 bar to d, expect beers
   |/    () [default] draft
   o  3:ca1b80f7960a added c
   |   () [default] draft
@@ -434,10 +434,10 @@
   
   **done showing editors text**
   
-  working directory is now at 89ea3eee2d69
+  working directory is now at b4c8664fa327
 
   $ hg glog
-  @  16:89ea3eee2d69 watbar to d
+  @  16:b4c8664fa327 watbar to d
   |   () [default] draft
   o  3:ca1b80f7960a added c
   |   () [default] draft
@@ -533,15 +533,15 @@
   a
   committing manifest
   committing changelog
-  working directory is now at 5bf84d1d71d1
+  working directory is now at 6aa6f90a9f68
   $ hg st
   $ glog
-  @  4:5bf84d1d71d1@default(draft) bk:[] More addition
+  @  4:6aa6f90a9f68@default(draft) bk:[] More addition
   |
   o  0:6569b5a81c7e@default(public) bk:[] root
   
   $ hg summary
-  parent: 4:5bf84d1d71d1 tip
+  parent: 4:6aa6f90a9f68 tip
    More addition
   branch: default
   commit: (clean)
@@ -552,7 +552,7 @@
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 5bf84d1d71d12f451bfe1e09b93045eb6338cd6c
+  # Node ID 6aa6f90a9f684b8a4b698234e25c5dad7328b199
   # Parent  6569b5a81c7e307ddc076550e8c0f6d75b6effcd
   More addition
   
@@ -576,10 +576,10 @@
 
   $ hg up --hidden 'min(desc("More addition"))'
   updating to a hidden changeset 867e43582046
-  (hidden revision '867e43582046' was rewritten as: 5bf84d1d71d1)
+  (hidden revision '867e43582046' was rewritten as: 6aa6f90a9f68)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   working directory parent is obsolete! (867e43582046)
-  (use 'hg evolve' to update to its successor: 5bf84d1d71d1)
+  (use 'hg evolve' to update to its successor: 6aa6f90a9f68)
   $ echo 'gotta break' >> a
   $ hg amend
   2 new content-divergent changesets
@@ -594,15 +594,15 @@
   $ glog
   @  6:13c1b75640a1@default(draft) bk:[] More addition (2)
   |
-  | *  4:5bf84d1d71d1@default(draft) bk:[] More addition
+  | *  4:6aa6f90a9f68@default(draft) bk:[] More addition
   |/
   o  0:6569b5a81c7e@default(public) bk:[] root
   
 
   $ hg evolve -qn --content-divergent --no-all
   hg update -c 13c1b75640a1 &&
-  hg merge 5bf84d1d71d1 &&
-  hg commit -m "auto merge resolving conflict between 13c1b75640a1 and 5bf84d1d71d1"&&
+  hg merge 6aa6f90a9f68 &&
+  hg commit -m "auto merge resolving conflict between 13c1b75640a1 and 6aa6f90a9f68"&&
   hg up -C 867e43582046 &&
   hg revert --all --rev tip &&
   hg commit -m "`hg log -r 13c1b75640a1 --template={desc}`";
@@ -633,9 +633,9 @@
   (no more unresolved files)
   continue: hg evolve --continue
   $ hg evolve --continue
-  working directory is now at 2346e1147fed
+  working directory is now at 22dc0f618f0d
   $ glog
-  @  7:2346e1147fed@default(draft) bk:[] More addition (2)
+  @  7:22dc0f618f0d@default(draft) bk:[] More addition (2)
   |
   o  0:6569b5a81c7e@default(public) bk:[] root
   
@@ -644,7 +644,7 @@
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 2346e1147fedc8c9aa17f9ba7870dcd8be52f567
+  # Node ID 22dc0f618f0d8714c611e7a683ad229a575f167c
   # Parent  6569b5a81c7e307ddc076550e8c0f6d75b6effcd
   More addition (2)
   
@@ -895,63 +895,66 @@
   19ed1bf64a2c: E3
     content-divergent: 084ae625fa51 (draft) (precursor 4a250e5bd992)
   
+  $ hg debugobsolete
+  4a250e5bd992a897655e3b6f238e12452cf063e9 084ae625fa51ca8c441ba1d2bf0f974b21671017 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
+  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")'
@@ -961,7 +964,7 @@
   merging numbers
   merging romans
   1 files updated, 2 files merged, 0 files removed, 0 files unresolved
-  working directory is now at aae293050980
+  working directory is now at e7cb08a7241a
   $ hg status
   $ hg amend -m 'E4'
   $ hg export
@@ -969,7 +972,7 @@
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
-  # Node ID 8c2a6aae4bc5c1cc00c68276017dcef3d468e895
+  # Node ID 50bb00cad3206c79d231a621e319772302a88d8d
   # Parent  6d1fdf6de7e2d9fc9b098aa286b60785bbeaab7a
   E4
   
@@ -992,29 +995,33 @@
   -VI
   +vi
   $ hg log -G
-  @  5:8c2a6aae4bc5@default(draft) E4 []
+  @  5:50bb00cad320@default(draft) E4 []
   |
   o  0:6d1fdf6de7e2@default(draft) root []
   
+  $ hg debugobsolete
+  4a250e5bd992a897655e3b6f238e12452cf063e9 084ae625fa51ca8c441ba1d2bf0f974b21671017 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
+  4a250e5bd992a897655e3b6f238e12452cf063e9 19ed1bf64a2cc2a824df5ac33a436eca1ae0475d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'amend', 'user': 'test'}
+  084ae625fa51ca8c441ba1d2bf0f974b21671017 e7cb08a7241a98c908db298b61fc033b27f648c7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'evolve', 'user': 'test'}
+  19ed1bf64a2cc2a824df5ac33a436eca1ae0475d e7cb08a7241a98c908db298b61fc033b27f648c7 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'operation': 'evolve', 'user': 'test'}
+  e7cb08a7241a98c908db298b61fc033b27f648c7 50bb00cad3206c79d231a621e319772302a88d8d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '1', 'operation': 'amend', 'user': 'test'}
   $ hg obslog --patch
-  @  8c2a6aae4bc5 (5) E4
+  @  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    aae293050980 (4) <<<<<<< divergent
-  |\     reworded(description) as 8c2a6aae4bc5 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
-  | |      diff -r aae293050980 -r 8c2a6aae4bc5 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 aae293050980 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
-  | |      diff -r 084ae625fa51 -r aae293050980 changeset-description
+  |
+  x    e7cb08a7241a (4) <<<<<<< divergent
+  |\     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
   | |      @@ -1,1 +1,4 @@
@@ -1043,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 aae293050980 using evolve by test (Thu Jan 01 00:00:00 1970 +0000)
-  |        diff -r 19ed1bf64a2c -r aae293050980 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
-  
-  
+