diff -r c834fdb87f90 -r 304de9a04172 tests/test-evolve-content-divergent-basic.t
--- a/tests/test-evolve-content-divergent-basic.t	Fri May 01 07:43:15 2020 -0700
+++ b/tests/test-evolve-content-divergent-basic.t	Fri May 01 07:44:01 2020 -0700
@@ -269,7 +269,7 @@
   $ 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
 
@@ -311,7 +311,7 @@
   $ echo foo > d
   $ hg amend -m "foo to d"
 
-  $ hg up a9d6fd6b5e40 --hidden
+  $ hg up 'predecessors(.)' --hidden
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset a9d6fd6b5e40
   (hidden revision 'a9d6fd6b5e40' was rewritten as: b10b07a394f1)
@@ -371,7 +371,7 @@
   $ echo bar > d
   $ hg amend -m "bar to d, expect beers"
 
-  $ hg up 11175423b5dc --hidden
+  $ hg up 'predecessors(.)' --hidden
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to hidden changeset 11175423b5dc
   (hidden revision '11175423b5dc' was rewritten as: 27f0463f169a)