Show More
@@ -667,7 +667,7 b' class filectx(object):' | |||||
667 |
|
667 | |||
668 | # use linkrev to find the first changeset where self appeared |
|
668 | # use linkrev to find the first changeset where self appeared | |
669 | if self.rev() != self.linkrev(): |
|
669 | if self.rev() != self.linkrev(): | |
670 |
base = self.filectx(self.file |
|
670 | base = self.filectx(self.filenode()) | |
671 | else: |
|
671 | else: | |
672 | base = self |
|
672 | base = self | |
673 |
|
673 | |||
@@ -736,7 +736,7 b' class filectx(object):' | |||||
736 | # prime the ancestor cache for the working directory |
|
736 | # prime the ancestor cache for the working directory | |
737 | acache = {} |
|
737 | acache = {} | |
738 | for c in (self, fc2): |
|
738 | for c in (self, fc2): | |
739 |
if c. |
|
739 | if c.filenode() is None: | |
740 | pl = [(n.path(), n.filenode()) for n in c.parents()] |
|
740 | pl = [(n.path(), n.filenode()) for n in c.parents()] | |
741 | acache[(c._path, None)] = pl |
|
741 | acache[(c._path, None)] = pl | |
742 |
|
742 |
General Comments 0
You need to be logged in to leave comments.
Login now