--- a/mercurial/localrepo.py	Thu Feb 16 15:58:51 2012 -0600
+++ b/mercurial/localrepo.py	Thu Feb 16 16:40:29 2012 -0600
@@ -949,6 +949,7 @@
             self.store.write()
             if self._dirtyphases:
                 phases.writeroots(self)
+                self._dirtyphases = False
             for k, ce in self._filecache.items():
                 if k == 'dirstate':
                     continue
@@ -1323,6 +1324,9 @@
         # tag cache retrieval" case to work.
         self.invalidatecaches()
 
+        # Discard all cache entries to force reloading everything.
+        self._filecache.clear()
+
     def walk(self, match, node=None):
         '''
         walk recursively through the directory tree or a given