Mercurial > hg

changeset 11228:5cdac5c35e68

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
author Matt Mackall <mpm@selenic.com>
date Fri, 28 May 2010 16:01:57 -0500
parents b9e89fc5c7f1 (current diff) 054549ccb680 (diff)
children 1e701ffd9df4
files mercurial/localrepo.py
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/localrepo.py	Thu May 27 10:37:14 2010 +0200
+++ b/mercurial/localrepo.py	Fri May 28 16:01:57 2010 -0500
@@ -1041,7 +1041,9 @@
             match.bad = bad
 
         if working: # we need to scan the working dir
-            subrepos = ctx1.substate.keys()
+            subrepos = []
+            if '.hgsub' in self.dirstate:
+                subrepos = ctx1.substate.keys()
             s = self.dirstate.status(match, subrepos, listignored,
                                      listclean, listunknown)
             cmp, modified, added, removed, deleted, unknown, ignored, clean = s