--- 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