##// END OF EJS Templates
context: use manifest.walk() instead of manifest.match() to get file list...
Augie Fackler -
r44735:beea86e4 default
parent child Browse files
Show More
@@ -2357,8 +2357,7 b' class overlayworkingctx(committablectx):'
2357 # Test the other direction -- that this path from p2 isn't a directory
2357 # Test the other direction -- that this path from p2 isn't a directory
2358 # in p1 (test that p1 doesn't have any paths matching `path/*`).
2358 # in p1 (test that p1 doesn't have any paths matching `path/*`).
2359 match = self.match([path], default=b'path')
2359 match = self.match([path], default=b'path')
2360 matches = self.p1().manifest().matches(match)
2360 mfiles = list(self.p1().manifest().walk(match))
2361 mfiles = matches.keys()
2362 if len(mfiles) > 0:
2361 if len(mfiles) > 0:
2363 if len(mfiles) == 1 and mfiles[0] == path:
2362 if len(mfiles) == 1 and mfiles[0] == path:
2364 return
2363 return
General Comments 0
You need to be logged in to leave comments. Login now