changeset 1268 | c631f26346ca |
parent 1245 | d0a960b437a8 |
child 1270 | fc3b41570082 |
--- a/mercurial/dirstate.py Fri Sep 16 14:01:03 2005 -0700 +++ b/mercurial/dirstate.py Sat Sep 17 00:23:19 2005 -0700 @@ -333,7 +333,8 @@ l.append(fn) if not s or stat.S_ISDIR(s.st_mode): - return self.ignore(fn) and False or match(fn) + if self.ignore(fn): return False + return match(fn) if not stat.S_ISREG(s.st_mode): return False