--- a/hgext3rd/evolve/rewriteutil.py	Wed May 23 11:18:14 2018 +0200
+++ b/hgext3rd/evolve/rewriteutil.py	Thu May 24 01:50:26 2018 +0530
@@ -22,7 +22,6 @@
     node,
     obsolete,
     phases,
-    repair,
     revset,
     util,
 )
@@ -155,7 +154,7 @@
         nodetobookmarks.setdefault(bnode, []).append(mark)
     for marks in nodetobookmarks.values():
         if bookmarks.issuperset(marks):
-            rsrevs = repair.stripbmrevset(repo, marks[0])
+            rsrevs = compat.bmrevset(repo, marks[0])
             revs = set(revs)
             revs.update(set(rsrevs))
             revs = sorted(revs)