--- a/hgext/evolve.py Thu Aug 23 12:53:27 2012 +0200
+++ b/hgext/evolve.py Thu Aug 23 14:15:36 2012 +0200
@@ -278,6 +278,10 @@
def _picknexttroubled(ui, repo, any=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:
troubled = list(repo.set('unstable()'))
if not troubled:
@@ -286,6 +290,7 @@
troubled = list(repo.set('conflicting()'))
if troubled:
tr = troubled[0]
+
return tr