diff -r 067e8d1178a2 -r d7114f883505 mercurial/copies.py
--- a/mercurial/copies.py	Sun Mar 25 18:27:43 2018 +0900
+++ b/mercurial/copies.py	Sun Mar 25 18:31:22 2018 +0900
@@ -280,7 +280,7 @@
         ac = repo.changelog.ancestors(revs, inclusive=True)
         ctx._ancestrycontext = ac
     def makectx(f, n):
-        if n in node.wdirnodes:  # in a working context?
+        if n in node.wdirfilenodeids:  # in a working context?
             if ctx.rev() is None:
                 return ctx.filectx(f)
             return repo[None][f]