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 2858 4b934144ed11
parent 2856 f6517779a7c4
child 3064 7a1a4d1f0958 
--- a/hgext3rd/evolve/compat.py	Thu Aug 24 10:48:38 2017 -0700
+++ b/hgext3rd/evolve/compat.py	Thu Aug 24 10:57:32 2017 -0700
@@ -110,13 +110,13 @@
     TROUBLES['CONTENTDIVERGENT'] = 'divergent'
     context.basectx.contentdivergent = context.basectx.divergent
 else:
-    TROUBLES['CONTENTDIVERGENT'] = 'contentdivergent'
+    TROUBLES['CONTENTDIVERGENT'] = 'content-divergent'
 
 if not util.safehasattr(context.basectx, 'phasedivergent'):
     TROUBLES['PHASEDIVERGENT'] = 'bumped'
     context.basectx.phasedivergent = context.basectx.bumped
 else:
-    TROUBLES['PHASEDIVERGENT'] = 'phasedivergent'
+    TROUBLES['PHASEDIVERGENT'] = 'phase-divergent'
 
 if not util.safehasattr(context.basectx, 'isunstable'):
     context.basectx.isunstable = context.basectx.troubled
evolve