diff mercurial/localrepo.py @ 16828:8abee656e14c

merge with stable

--- a/mercurial/localrepo.py	Fri Jun 01 15:13:05 2012 -0500
+++ b/mercurial/localrepo.py	Fri Jun 01 15:14:29 2012 -0500
@@ -838,6 +838,9 @@
                         self.sjoin('phaseroots'))
         self.invalidate()
 
+        # Discard all cache entries to force reloading everything.
+        self._filecache.clear()
+
         parentgone = (parents[0] not in self.changelog.nodemap or
                       parents[1] not in self.changelog.nodemap)
         if parentgone:
@@ -1320,9 +1323,6 @@
         # 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