Mercurial > hg

changeset 24775:36993b52d016

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 16 Apr 2015 17:30:01 -0500
parents a9d63d87b837 (current diff) 612ed41ae359 (diff)
children 52628cd73d3e
files mercurial/context.py
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/context.py	Sat Apr 04 02:16:48 2015 -0700
+++ b/mercurial/context.py	Thu Apr 16 17:30:01 2015 -0500
@@ -908,6 +908,7 @@
         introrev = self.introrev()
         if self.rev() != introrev:
             base = self.filectx(self.filenode(), changeid=introrev)
+        if getattr(base, '_ancestrycontext', None) is None:
             ac = self._repo.changelog.ancestors([introrev], inclusive=True)
             base._ancestrycontext = ac