diff -r 66796d7b5415 -r 1db0137297f4 hgext3rd/evolve/compat.py --- a/hgext3rd/evolve/compat.py Thu Aug 24 09:11:06 2017 +0200 +++ b/hgext3rd/evolve/compat.py Thu Aug 24 09:11:54 2017 +0200 @@ -110,7 +110,10 @@ context.basectx.contentdivergent = context.basectx.divergent if not util.safehasattr(context.basectx, 'phasedivergent'): + TROUBLES['PHASEDIVERGENT'] = 'bumped' context.basectx.phasedivergent = context.basectx.bumped +else: + TROUBLES['PHASEDIVERGENT'] = 'phasedivergent' if not util.safehasattr(context.basectx, 'isunstable'): context.basectx.isunstable = context.basectx.troubled