changeset 9750 | f153af9580fe |
parent 9547 | f57640bf10d4 |
child 9751 | f8ca4035a949 |
--- a/mercurial/context.py Thu Nov 05 16:40:48 2009 -0500 +++ b/mercurial/context.py Sat Nov 07 14:07:45 2009 -0600 @@ -451,6 +451,10 @@ find the common ancestor file context, if any, of self, and fc2 """ + actx = self.changectx().ancestor(fc2.changectx()) + if self.path() in actx: + return actx[self.path()] + acache = {} # prime the ancestor cache for the working directory