# HG changeset patch # User Martin von Zweigbergk # Date 1503596918 25200 # Node ID 0c286d054bcd077bf1879f5f3db60386b526356e # Parent f6517779a7c47471772dbbfb7025050ed71650ab warning: use 'divergent', not 'contentdivergent' on old Mercurial This was just an oversight in f6517779a7c4 (warning: rename warning message, 2017-08-24). diff -r f6517779a7c4 -r 0c286d054bcd hgext3rd/evolve/__init__.py --- 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')