diff -r fc32b2fc468e -r 24ce8f0c0a39 mercurial/context.py
--- a/mercurial/context.py	Thu Dec 31 16:30:34 2009 -0600
+++ b/mercurial/context.py	Thu Dec 31 17:19:30 2009 -0600
@@ -638,7 +638,8 @@
         return self._parents[0].ancestor(c2) # punt on two parents for now
 
     def walk(self, match):
-        return sorted(self._repo.dirstate.walk(match, True, False))
+        return sorted(self._repo.dirstate.walk(match, self.substate.keys(),
+                                               True, False))
 
     def dirty(self, missing=False):
         "check whether a working directory is modified"