diff -r e655b378ce73 -r 054549ccb680 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Tue May 25 18:19:40 2010 +0200
+++ b/mercurial/localrepo.py	Fri May 28 14:41:11 2010 -0500
@@ -1010,7 +1010,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