Mercurial > hg

diff mercurial/exchange.py @ 33688:2194a8723138

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolution: rename divergent to content-divergent Rename divergent to content-divergent in all external user-facing output. Only update user-facing output for the moment, variables names, templates keyword and potentially configuration would be done in later series. The renaming is done according to https://www.mercurial-scm.org/wiki/CEDVocabulary. Differential Revision: https://phab.mercurial-scm.org/D215
author Boris Feld <boris.feld@octobus.net>
date Tue, 01 Aug 2017 17:58:20 +0200
parents 03039ff3082b
children 9c27a2891b75
line wrap: on
line diff
--- a/mercurial/exchange.py	Thu Aug 03 00:45:02 2017 +0900
+++ b/mercurial/exchange.py	Tue Aug 01 17:58:20 2017 +0200
@@ -677,9 +677,10 @@
         if unfi.obsstore:
             # this message are here for 80 char limit reason
             mso = _("push includes obsolete changeset: %s!")
+            mscd = _("push includes content-divergent changeset: %s!")
             mst = {"orphan": _("push includes orphan changeset: %s!"),
                    "bumped": _("push includes bumped changeset: %s!"),
-                   "divergent": _("push includes divergent changeset: %s!")}
+                   "content-divergent": mscd}
             # If we are to push if there is at least one
             # obsolete or unstable changeset in missing, at
             # least one of the missinghead will be obsolete or