Show More
@@ -308,9 +308,8 b' class dirstate:' | |||
|
308 | 308 | ds = os.path.join(nd, f +'/') |
|
309 | 309 | if statmatch(ds, st): |
|
310 | 310 | work.append(p) |
|
311 | elif supported_type(np, st): | |
|
312 |
|
|
|
313 | yield util.pconvert(np) | |
|
311 | elif statmatch(np, st) and supported_type(np, st): | |
|
312 | yield util.pconvert(np) | |
|
314 | 313 | |
|
315 | 314 | |
|
316 | 315 | known = {'.hg': 1} |
@@ -340,7 +339,7 b' class dirstate:' | |||
|
340 | 339 | continue |
|
341 | 340 | found = False |
|
342 | 341 | self.blockignore = True |
|
343 |
if s |
|
|
342 | if statmatch(ff, st) and supported_type(ff, st): | |
|
344 | 343 | found = True |
|
345 | 344 | self.blockignore = False |
|
346 | 345 | if found: |
General Comments 0
You need to be logged in to leave comments.
Login now