Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
warning: use 'divergent', not 'contentdivergent' on old Mercurial
authorMartin von Zweigbergk <martinvonz@google.com>
Thu, 24 Aug 2017 10:48:38 -0700
changeset 2857 0c286d054bcd
parent 2856 f6517779a7c4
child 2858 4b934144ed11
warning: use 'divergent', not 'contentdivergent' on old Mercurial This was just an oversight in f6517779a7c4 (warning: rename warning message, 2017-08-24).
hgext3rd/evolve/__init__.py file | annotate | diff | comparison | revisions 
--- a/hgext3rd/evolve/__init__.py	Thu Aug 24 09:12:09 2017 +0200
+++ b/hgext3rd/evolve/__init__.py	Thu Aug 24 10:48:38 2017 -0700
@@ -777,7 +777,7 @@
     if newbumpeds > 0:
         ui.warn(base_msg % (newbumpeds, compat.TROUBLES['PHASEDIVERGENT']))
     if newdivergents > 0:
-        ui.warn(_('%i new contentdivergent changesets\n') % newdivergents)
+        ui.warn(base_msg % (newdivergents, compat.TROUBLES['CONTENTDIVERGENT']))
     return ret
 
 @eh.wrapfunction(mercurial.exchange, 'push')
evolve