From b8303a2222ad7ea248129e826a61d1044af97ee8 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Wed, 23 Oct 2013 12:06:59 +0200
Subject: [PATCH] IDEA-115272 Lots of [partial] incoming changes, and NPE in
 CommittedChangesCache

---
 .../intellij/openapi/vcs/changes/committed/ChangesCacheFile.java | 1 +
 1 file changed, 1 insertion(+)

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 79cb1b885c0e..8a450e2a209a 100644
--- 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
@@ -872,6 +872,7 @@ public class ChangesCacheFile {
         }
         
         for (Change change : changes) {
+          if (data.accountedChanges.contains(change)) continue;
           Function<VcsRevisionNumber, ProcessingResult> revisionHandler = results.get(change).revisionDependentProcessing;
           if (revisionHandler != null) {
             results.put(change, revisionHandler.fun(myCurrentRevisions.get(revisionDependentFiles.get(change))));