Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 33715:9c27a2891b75

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolution: rename bumped to phase-divergent Rename bumped to phase-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/D216
author Boris Feld <boris.feld@octobus.net>
date Tue, 01 Aug 2017 18:07:34 +0200
parents 2194a8723138
children db3dc11356ed
line wrap: on
line diff
--- a/mercurial/commands.py	Tue Aug 01 17:58:20 2017 +0200
+++ b/mercurial/commands.py	Tue Aug 01 18:07:34 2017 +0200
@@ -4943,7 +4943,7 @@
             troublemsg = {
                "unstable": _("orphan: %d changesets"),
                "divergent": _("content-divergent: %d changesets"),
-               "bumped": _("bumped: %d changesets"),
+               "bumped": _("phase-divergent: %d changesets"),
             }
             if numtrouble > 0:
                 ui.status(troublemsg[trouble] % numtrouble + "\n")