Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
authorMatt Mackall <mpm@selenic.com>
Thu, 16 Apr 2015 17:30:01 -0500
changeset 24775 36993b52d016
parent 24774 a9d63d87b837 (current diff)
parent 24753 612ed41ae359 (diff)
child 24776 52628cd73d3e
merge with stable
mercurial/context.py file | annotate | diff | comparison | revisions 
--- 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
hg-stable