Skip to content
Snippets Groups Projects
Commit f153af95 authored by Matt Mackall's avatar Matt Mackall
Browse files

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.
parent 1b1b33ae
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment