Show More
@@ -1954,7 +1954,7 b' class overlayworkingctx(committablectx):' | |||||
1954 |
|
1954 | |||
1955 | # Test the other direction -- that this path from p2 isn't a directory |
|
1955 | # Test the other direction -- that this path from p2 isn't a directory | |
1956 | # in p1 (test that p1 doesn't have any paths matching `path/*`). |
|
1956 | # in p1 (test that p1 doesn't have any paths matching `path/*`). | |
1957 |
match = self.match([path |
|
1957 | match = self.match([path], default=b'path') | |
1958 | matches = self.p1().manifest().matches(match) |
|
1958 | matches = self.p1().manifest().matches(match) | |
1959 | mfiles = matches.keys() |
|
1959 | mfiles = matches.keys() | |
1960 | if len(mfiles) > 0: |
|
1960 | if len(mfiles) > 0: |
General Comments 0
You need to be logged in to leave comments.
Login now