Merge remote-tracking branch 'origin/master'

[idea/community.git] / platform / vcs-impl / src / com / intellij / openapi / vcs / changes / committed / ChangesCacheFile.java

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangesCacheFile.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangesCacheFile.java
index fe45bfe900afbc57a10e223cc0205bc601eaaae9..ed5c664561a193ffe4295a2e7bbe5b71892034eb 100644 (file)
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangesCacheFile.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangesCacheFile.java
@@ -962,7 +962,6 @@ public class ChangesCacheFile {
           return new ProcessingResult(true, AFTER_DOES_NOT_MATTER_ALIEN_PATH);
         }
 
-        localPath.refresh();
         final VirtualFile file = localPath.getVirtualFile();
         if (isDeletedFile(myDeletedFiles, afterRevision, myReplacedFiles)) {
           debug("Found deleted file");
@@ -1011,7 +1010,6 @@ public class ChangesCacheFile {
           debug("Skipping deleted file outside of incoming files: " + beforeRevision.getFile());
           return new ProcessingResult(true, BEFORE_DOES_NOT_MATTER_OUTSIDE);
         }
-        beforeRevision.getFile().refresh();
         if (beforeRevision.getFile().getVirtualFile() == null || myCreatedFiles.contains(beforeRevision.getFile())) {
           // if not deleted from vcs, mark as incoming, otherwise file already deleted
           final boolean locallyDeleted = myClManager.isContainedInLocallyDeleted(beforeRevision.getFile());