--- a/hgext3rd/evolve/evolvecmd.py	Fri Feb 23 11:02:59 2018 +0100
+++ b/hgext3rd/evolve/evolvecmd.py	Mon Feb 26 13:59:30 2018 +0100
@@ -182,7 +182,7 @@
         msg = _('skipping %s : we do not handle merge yet\n') % bumped
         ui.write_err(msg)
         return (False, '')
-    prec = repo.set('last(allprecursors(%d) and public())', bumped).next()
+    prec = repo.set('last(allprecursors(%d) and public())', bumped.rev()).next()
     # For now we deny target merge
     if len(prec.parents()) > 1:
         msg = _('skipping: %s: public version is a merge, '
@@ -214,7 +214,7 @@
     tr = repo.currenttransaction()
     assert tr is not None
     bmupdate = _bookmarksupdater(repo, bumped.node(), tr)
-    if not list(repo.set('parents(%d) and parents(%d)', bumped, prec)):
+    if not list(repo.set('parents(%d) and parents(%d)', bumped.rev(), prec.rev())):
         # Need to rebase the changeset at the right place
         repo.ui.status(
             _('rebasing to destination parent: %s\n') % prec.p1())
@@ -632,7 +632,7 @@
     XXX this woobly function won't survive XXX
     """
     repo = ctx._repo.unfiltered()
-    for base in repo.set('reverse(allprecursors(%d))', ctx):
+    for base in repo.set('reverse(allprecursors(%d))', ctx.rev()):
         newer = compat.successorssets(ctx._repo, base.node())
         # drop filter and solution including the original ctx
         newer = [n for n in newer if n and ctx.node() not in n]