diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -2178,8 +2178,6 @@ """ def getfilectx(repo, memctx, path): fctx = ctx[path] - # this is weird but apparently we only keep track of one parent - # (why not only store that instead of a tuple?) copied = fctx.renamed() if copied: copied = copied[0]