D5999: context: use includematcher when checking dir/file conflicts
spectral (Kyle Lippincott)
phabricator at mercurial-scm.org
Fri Feb 22 00:51:08 EST 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGcd7059d17cb2: context: use includematcher when checking dir/file conflicts (authored by spectral, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5999?vs=14182&id=14189
REVISION DETAIL
https://phab.mercurial-scm.org/D5999
AFFECTED FILES
mercurial/context.py
CHANGE DETAILS
diff --git a/mercurial/context.py b/mercurial/context.py
--- a/mercurial/context.py
+++ b/mercurial/context.py
@@ -1951,7 +1951,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(pats=[path + '/'], default=b'path')
+ match = self.match(include=[path + '/'], default=b'path')
matches = self.p1().manifest().matches(match)
mfiles = matches.keys()
if len(mfiles) > 0:
To: spectral, #hg-reviewers, martinvonz
Cc: martinvonz, mercurial-devel
More information about the Mercurial-devel
mailing list