Mercurial > public > mercurial-scm > hg-stable

diff mercurial/context.py @ 33714: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/context.py	Thu Aug 03 00:45:02 2017 +0900
+++ b/mercurial/context.py	Tue Aug 01 17:58:20 2017 +0200
@@ -231,7 +231,7 @@
         Troubles are returned as strings. possible values are:
         - orphan,
         - bumped,
-        - divergent.
+        - content-divergent.
         """
         troubles = []
         if self.unstable():
@@ -239,7 +239,7 @@
         if self.bumped():
             troubles.append('bumped')
         if self.divergent():
-            troubles.append('divergent')
+            troubles.append('content-divergent')
         return troubles
 
     def parents(self):