Mercurial > public > mercurial-scm > hg-stable

diff mercurial/localrepo.py @ 14870:f73c7b70df68 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: use working copy of .hgsub to filter status (issue2901)
author Matt Mackall <mpm@selenic.com>
date Wed, 13 Jul 2011 17:41:49 -0500
parents de9eb6b1da4f
children 96a72cbc6c29
line wrap: on
line diff
--- a/mercurial/localrepo.py	Wed Jul 13 16:28:46 2011 -0500
+++ b/mercurial/localrepo.py	Wed Jul 13 17:41:49 2011 -0500
@@ -1195,7 +1195,7 @@
         if working: # we need to scan the working dir
             subrepos = []
             if '.hgsub' in self.dirstate:
-                subrepos = ctx1.substate.keys()
+                subrepos = ctx2.substate.keys()
             s = self.dirstate.status(match, subrepos, listignored,
                                      listclean, listunknown)
             cmp, modified, added, removed, deleted, unknown, ignored, clean = s