diff -r 673f0fdc1046 -r 0298a07f64d9 mercurial/copies.py
--- a/mercurial/copies.py	Mon Nov 07 18:57:54 2016 -0800
+++ b/mercurial/copies.py	Thu Nov 10 02:17:22 2016 -0800
@@ -278,7 +278,7 @@
         ac = repo.changelog.ancestors(revs, inclusive=True)
         ctx._ancestrycontext = ac
     def makectx(f, n):
-        if len(n) != 20:  # in a working context?
+        if len(n) != 20 or n in node.wdirnodes:  # in a working context?
             if ctx.rev() is None:
                 return ctx.filectx(f)
             return repo[None][f]