mercurial/context.py
branchstable
changeset 40816 1c8c54cf9725
parent 40803 44c2e80db985
child 40819 cb372d09d30a
child 40986 328557af18eb
--- a/mercurial/context.py	Tue Dec 04 08:56:43 2018 -0800
+++ b/mercurial/context.py	Tue Nov 20 14:43:27 2018 -0800
@@ -1848,8 +1848,8 @@
                 fail(path, component)
 
         # Test the other direction -- that this path from p2 isn't a directory
-        # in p1 (test that p1 doesn't any paths matching `path/*`).
-        match = matchmod.match('/', '', [path + '/'], default=b'relpath')
+        # in p1 (test that p1 doesn't have any paths matching `path/*`).
+        match = self.match(pats=[path + '/'], default=b'path')
         matches = self.p1().manifest().matches(match)
         mfiles = matches.keys()
         if len(mfiles) > 0: