Show More
@@ -774,9 +774,15 b' class basefilectx(object):' | |||
|
774 | 774 | # hack to reuse ancestor computation when searching for renames |
|
775 | 775 | memberanc = getattr(self, '_ancestrycontext', None) |
|
776 | 776 | iteranc = None |
|
777 |
|
|
|
777 | if srcrev is None: | |
|
778 | # wctx case, used by workingfilectx during mergecopy | |
|
779 | revs = [p.rev() for p in self._repo[None].parents()] | |
|
780 | inclusive = True # we skipped the real (revless) source | |
|
781 | else: | |
|
782 | revs = [srcrev] | |
|
778 | 783 | if memberanc is None: |
|
779 |
memberanc = iteranc = cl.ancestors(revs, lkr, |
|
|
784 | memberanc = iteranc = cl.ancestors(revs, lkr, | |
|
785 | inclusive=inclusive) | |
|
780 | 786 | # check if this linkrev is an ancestor of srcrev |
|
781 | 787 | if lkr not in memberanc: |
|
782 | 788 | if iteranc is None: |
General Comments 0
You need to be logged in to leave comments.
Login now