--- a/hgext/evolve.py	Fri Jun 19 17:35:29 2015 -0700
+++ b/hgext/evolve.py	Fri Jun 19 17:47:48 2015 -0700
@@ -1548,25 +1548,6 @@
     progresscb()
     _cleanup(ui, repo, startnode, showprogress)
 
-def _picknexttroubled(ui, repo, category, pickany=False, progresscb=None):
-    """Pick a the next trouble changeset to solve"""
-    if progresscb: progresscb()
-    tro = _stabilizableunstable(repo, repo['.'])
-    if tro is None:
-        wdp = repo['.']
-        if 'divergent' in wdp.troubles():
-            tro = wdp
-    if tro is None and pickany:
-        troubled = list(repo.set('unstable()'))
-        if not troubled:
-            troubled = list(repo.set('bumped()'))
-        if not troubled:
-            troubled = list(repo.set('divergent()'))
-        if troubled:
-            tro = troubled[0]
-
-    return tro
-
 def _stabilizableunstable(repo, pctx):
     """Return a changectx for an unstable changeset which can be
     stabilized on top of pctx or one of its descendants. None if none