Mercurial > public > mercurial-scm > hg
diff mercurial/exchange.py @ 33689:9c27a2891b75
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/exchange.py Tue Aug 01 17:58:20 2017 +0200 +++ b/mercurial/exchange.py Tue Aug 01 18:07:34 2017 +0200 @@ -677,9 +677,10 @@ if unfi.obsstore: # this message are here for 80 char limit reason mso = _("push includes obsolete changeset: %s!") + mspd = _("push includes phase-divergent changeset: %s!") mscd = _("push includes content-divergent changeset: %s!") mst = {"orphan": _("push includes orphan changeset: %s!"), - "bumped": _("push includes bumped changeset: %s!"), + "phase-divergent": mspd, "content-divergent": mscd} # If we are to push if there is at least one # obsolete or unstable changeset in missing, at