Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext3rd/evolve/compat.py
changeset 2855 1db0137297f4
parent 2854 66796d7b5415
child 2856 f6517779a7c4 
--- 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
evolve