--- a/hgext/evolve.py	Sat Aug 25 08:26:28 2012 +0200
+++ b/hgext/evolve.py	Sat Aug 25 08:30:02 2012 +0200
@@ -1338,14 +1338,14 @@
     else:
         assert False  # WHAT? unknown troubles
 
-def _picknexttroubled(ui, repo, any=False):
+def _picknexttroubled(ui, repo, pickany=False):
     """Pick a the next trouble changeset to solve"""
     tr = _stabilizableunstable(repo, repo['.'])
     if tr is None:
         wdp = repo['.']
         if 'conflicting' in wdp.troubles():
             tr = wdp
-    if tr is None and any:
+    if tr is None and pickany:
         troubled = list(repo.set('unstable()'))
         if not troubled:
             troubled = list(repo.set('latecomer()'))