--- a/hgext3rd/topic/evolvebits.py Thu Apr 19 16:08:01 2018 +0200
+++ b/hgext3rd/topic/evolvebits.py Thu Apr 19 16:12:37 2018 +0200
@@ -1,6 +1,8 @@
import collections
-from . import compat
+from mercurial import (
+ obsutil,
+)
# Copied from evolve 081605c2e9b6
@@ -73,14 +75,14 @@
return p.rev()
obs = repo[p]
ui = repo.ui
- newer = compat.successorssets(repo, obs.node())
+ newer = obsutil.successorssets(repo, obs.node())
# search of a parent which is not killed
while not newer:
ui.debug("stabilize target %s is plain dead,"
" trying to stabilize on its parent\n" %
obs)
obs = obs.parents()[0]
- newer = compat.successorssets(repo, obs.node())
+ newer = obsutil.successorssets(repo, obs.node())
if 1 < len(newer):
# divergence case
# we should pick as arbitrary one