# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1518264881 -32400
# Node ID de0666564bde7c67c4d40a44dcf50515fef2f367
# Parent  b7e2cf114e8593f27c86ae09ccee53509bc2d77b# Parent  7b2b82f891bf6355ed87c06ed9198bfcd033fe7d
merge with stable

diff -r b7e2cf114e85 -r de0666564bde mercurial/fileset.py
--- a/mercurial/fileset.py	Fri Feb 09 22:49:20 2018 +0100
+++ b/mercurial/fileset.py	Sat Feb 10 21:14:41 2018 +0900
@@ -464,9 +464,10 @@
     getargs(x, 0, 0, _("copied takes no arguments"))
     s = []
     for f in mctx.subset:
-        p = mctx.ctx[f].parents()
-        if p and p[0].path() != f:
-            s.append(f)
+        if f in mctx.ctx:
+            p = mctx.ctx[f].parents()
+            if p and p[0].path() != f:
+                s.append(f)
     return s
 
 @predicate('revs(revs, pattern)')
diff -r b7e2cf114e85 -r de0666564bde tests/test-fileset.t
--- a/tests/test-fileset.t	Fri Feb 09 22:49:20 2018 +0100
+++ b/tests/test-fileset.t	Sat Feb 10 21:14:41 2018 +0900
@@ -249,6 +249,8 @@
 Test merge states
 
   $ hg ci -m manychanges
+  $ hg file -r . 'set:copied() & modified()'
+  [1]
   $ hg up -C 0
   * files updated, 0 files merged, * files removed, 0 files unresolved (glob)
   $ echo c >> b2