From 052b29c5998f59da7a275c2cad0556a7ddbe747b Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Wed, 25 Apr 2012 19:02:15 +0400
Subject: [PATCH] short diff: correctly process situation when file status is
 deleted but it exists (svn tree unversioned vs incoming add conflict)

---
 .../openapi/vcs/changes/FragmentedDiffRequestFromChange.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/FragmentedDiffRequestFromChange.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/FragmentedDiffRequestFromChange.java
index 05621764e935..f985a77fb01d 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/FragmentedDiffRequestFromChange.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/FragmentedDiffRequestFromChange.java
@@ -117,7 +117,8 @@ public class FragmentedDiffRequestFromChange {
             myOldDocument = documentFromRevision(change.getBeforeRevision());
             final String convertedPath = FilePathsHelper.convertPath(filePath);
             if (filePath.getVirtualFile() != null) {
-              myDocument = FileDocumentManager.getInstance().getDocument(filePath.getVirtualFile());
+              myDocument = FileStatus.DELETED.equals(change.getFileStatus()) ? new DocumentImpl("") :
+                           FileDocumentManager.getInstance().getDocument(filePath.getVirtualFile());
               if (myDocument != null) {
                 final List<BeforeAfter<TextRange>> cached = cache.get(new Pair<Long, String>(myDocument.getModificationStamp(), convertedPath));
                 if (cached != null) {