diff -r b9e89fc5c7f1 -r 5cdac5c35e68 mercurial/localrepo.py
--- 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