diff -r 18e6ea9ba81d -r ee7b6fa52d9d mercurial/copies.py --- a/mercurial/copies.py Thu May 17 15:25:52 2018 -0700 +++ b/mercurial/copies.py Thu May 17 15:33:28 2018 -0700 @@ -254,6 +254,11 @@ repo.ui.debug("%s:\n %s\n" % (header % 'local', "\n ".join(u1))) if u2: repo.ui.debug("%s:\n %s\n" % (header % 'other', "\n ".join(u2))) + + narrowmatch = repo.narrowmatch() + if not narrowmatch.always(): + u1 = [f for f in u1 if narrowmatch(f)] + u2 = [f for f in u2 if narrowmatch(f)] return u1, u2 def _makegetfctx(ctx):