diff mercurial/revset.py @ 33799:f3f06c260e9e

obsolete: rename divergent volatile set into contentdivergent volatile set The renaming is done according to https://www.mercurial-scm.org/wiki/CEDVocabulary. Differential Revision: https://phab.mercurial-scm.org/D254
author Boris Feld <boris.feld@octobus.net>
date Fri, 04 Aug 2017 19:36:27 +0200
parents d4b7496f7d0b
children 9fa874fb34e1
line wrap: on
line diff
--- a/mercurial/revset.py	Fri Aug 04 19:27:39 2017 +0200
+++ b/mercurial/revset.py	Fri Aug 04 19:36:27 2017 +0200
@@ -732,8 +732,8 @@
     """
     # i18n: "contentdivergent" is a keyword
     getargs(x, 0, 0, _("contentdivergent takes no arguments"))
-    divergent = obsmod.getrevs(repo, 'divergent')
-    return subset & divergent
+    contentdivergent = obsmod.getrevs(repo, 'contentdivergent')
+    return subset & contentdivergent
 
 @predicate('extinct()', safe=True)
 def extinct(repo, subset, x):