diff -r c86256bd4eb8 -r beea86e4d332 mercurial/context.py
--- a/mercurial/context.py	Wed Feb 05 15:01:22 2020 -0500
+++ b/mercurial/context.py	Wed Feb 05 15:15:18 2020 -0500
@@ -2357,8 +2357,7 @@
         # Test the other direction -- that this path from p2 isn't a directory
         # in p1 (test that p1 doesn't have any paths matching `path/*`).
         match = self.match([path], default=b'path')
-        matches = self.p1().manifest().matches(match)
-        mfiles = matches.keys()
+        mfiles = list(self.p1().manifest().walk(match))
         if len(mfiles) > 0:
             if len(mfiles) == 1 and mfiles[0] == path:
                 return