diff -r 8019f96ec4ce -r dc526561111c mercurial/context.py --- a/mercurial/context.py Fri Dec 28 14:22:24 2012 +0100 +++ b/mercurial/context.py Mon Dec 17 15:06:15 2012 +0100 @@ -264,6 +264,10 @@ """ return self.rev() in obsmod.getrevs(self._repo, 'divergent') + def troubled(self): + """True if the changeset is either unstable, bumped or divergent""" + return self.unstable() or self.bumped() or self.divergent() + def _fileinfo(self, path): if '_manifest' in self.__dict__: try: