Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with stable
authorMatt Mackall <mpm@selenic.com>
Fri, 28 May 2010 16:01:57 -0500
changeset 11228 5cdac5c35e68
parent 11226 b9e89fc5c7f1 (current diff)
parent 11227 054549ccb680 (diff)
child 11229 1e701ffd9df4
Merge with stable
mercurial/localrepo.py file | annotate | diff | comparison | revisions 
--- 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
Mercurial