# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1429223401 18000
# Node ID 36993b52d01687e98e9bf44e18dbaf836337693f
# Parent  a9d63d87b837c09cf669ebfc494bd99c271a5abb# Parent  612ed41ae359f458dbdc74f03ce9542d3816859d
merge with stable

diff -r a9d63d87b837 -r 36993b52d016 mercurial/context.py
--- 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