# HG changeset patch
# User Martin von Zweigbergk <martinv...@google.com>
# Date 1503596918 25200
# Thu Aug 24 10:48:38 2017 -0700
# Node ID f56cdb3e73fddd085e84a3ba58367a83ad1f71ee
# 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 --git a/hgext3rd/evolve/__init__.py b/hgext3rd/evolve/__init__.py
--- a/hgext3rd/evolve/__init__.py
+++ b/hgext3rd/evolve/__init__.py
@@ -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')
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
