Mercurial > hg > mercurial-crew-with-dirclash

diff mercurial/dirstate.py @ 4256:fe0fe0b4d73b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge additional fixes for my matcher changes
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Tue, 20 Mar 2007 22:21:05 -0300
parents 0d51eb296fb9 a7cae4e22749
children 1cc5fc1d0994
line wrap: on
line diff
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -442,7 +442,7 @@ class dirstate(object):
                     # don't trip over symlinks
                     st = os.lstat(p)
                     if stat.S_ISDIR(st.st_mode):
-                        if not ignore(p):
+                        if not ignore(np):
                             work.append(p)
                             if directories:
                                 yield 'd', np, st