Mercurial > hg

diff mercurial/dirstate.py @ 12401:4cdaf1adafc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backout most of 4f8067c94729
author Matt Mackall <mpm@selenic.com>
date Fri, 24 Sep 2010 12:46:54 -0500
parents 4f8067c94729
children e255a5dc29e6
line wrap: on
line diff
--- a/mercurial/dirstate.py	Fri Sep 24 12:00:55 2010 +0200
+++ b/mercurial/dirstate.py	Fri Sep 24 12:46:54 2010 -0500
@@ -531,7 +531,7 @@
                     match.dir(nf)
                     if not dirignore(nf):
                         wadd(nf)
-                elif kind in (regkind, lnkkind):
+                elif kind == regkind or kind == lnkkind:
                     results[nf] = st
                 else:
                     badfn(ff, badtype(kind))