Mercurial > public > mercurial-scm > hg-stable
diff mercurial/context.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/context.py Fri Aug 04 19:27:39 2017 +0200 +++ b/mercurial/context.py Fri Aug 04 19:36:27 2017 +0200 @@ -237,7 +237,7 @@ Only non-public and non-obsolete changesets may be divergent. """ - return self.rev() in obsmod.getrevs(self._repo, 'divergent') + return self.rev() in obsmod.getrevs(self._repo, 'contentdivergent') def troubled(self): msg = ("'context.troubled' is deprecated, "