# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1257624465 21600
# Node ID f153af9580fe547e74d2b805f9cc52763ce497e2
# Parent  1b1b33ae5a24467d3380a872b2ce3896f95e5f14
merge: first part of fix for issue1327

When there are no renames involved, we shortcut to the changeset
ancestor. This resolves most cases.

Note that Mercurial's rename philosophy elsewhere is that a file's
name is signficant and rename data is only consulted when a file of
the same name is absent.

diff -r 1b1b33ae5a24 -r f153af9580fe mercurial/context.py
--- 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