Mercurial > hg
diff mercurial/ancestor.py @ 38739:7acec9408e1c stable
release: merge default into stable for 4.7 release freeze
author | Augie Fackler <augie@google.com> |
---|---|
date | Thu, 19 Jul 2018 13:55:54 -0400 |
parents | f8b46245b26a |
children | e7aa113b14f7 |
line wrap: on
line diff
--- a/mercurial/ancestor.py Sun Jul 01 23:36:53 2018 +0900 +++ b/mercurial/ancestor.py Thu Jul 19 13:55:54 2018 -0400 @@ -339,6 +339,10 @@ seen = self._containsseen if target in seen: return True + # Only integer target is valid, but some callers expect 'None in self' + # to be False. So we explicitly allow it. + if target is None: + return False parentrevs = self._parentrevs visit = self._containsvisit