Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
33688:2194a8723138 | 33689:9c27a2891b75 |
---|---|
675 # if repo.obsstore == False --> no obsolete | 675 # if repo.obsstore == False --> no obsolete |
676 # then, save the iteration | 676 # then, save the iteration |
677 if unfi.obsstore: | 677 if unfi.obsstore: |
678 # this message are here for 80 char limit reason | 678 # this message are here for 80 char limit reason |
679 mso = _("push includes obsolete changeset: %s!") | 679 mso = _("push includes obsolete changeset: %s!") |
680 mspd = _("push includes phase-divergent changeset: %s!") | |
680 mscd = _("push includes content-divergent changeset: %s!") | 681 mscd = _("push includes content-divergent changeset: %s!") |
681 mst = {"orphan": _("push includes orphan changeset: %s!"), | 682 mst = {"orphan": _("push includes orphan changeset: %s!"), |
682 "bumped": _("push includes bumped changeset: %s!"), | 683 "phase-divergent": mspd, |
683 "content-divergent": mscd} | 684 "content-divergent": mscd} |
684 # If we are to push if there is at least one | 685 # If we are to push if there is at least one |
685 # obsolete or unstable changeset in missing, at | 686 # obsolete or unstable changeset in missing, at |
686 # least one of the missinghead will be obsolete or | 687 # least one of the missinghead will be obsolete or |
687 # unstable. So checking heads only is ok | 688 # unstable. So checking heads only is ok |