Mercurial > public > mercurial-scm > hg-stable

diff mercurial/context.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 ab0c55c2ad9a
line wrap: on
line diff
--- a/mercurial/context.py	Tue Aug 01 17:58:20 2017 +0200
+++ b/mercurial/context.py	Tue Aug 01 18:07:34 2017 +0200
@@ -230,14 +230,14 @@
 
         Troubles are returned as strings. possible values are:
         - orphan,
-        - bumped,
+        - phase-divergent,
         - content-divergent.
         """
         troubles = []
         if self.unstable():
             troubles.append('orphan')
         if self.bumped():
-            troubles.append('bumped')
+            troubles.append('phase-divergent')
         if self.divergent():
             troubles.append('content-divergent')
         return troubles