MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

short diff: correctly process situation when file status is deleted but it exists (svn tree unversioned vs incoming add conflict)

Browse Source
This commit is contained in:
irengrig
2012-05-10 17:02:12 +04:00
parent f2548d251a
commit 052b29c599
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/FragmentedDiffRequestFromChange.java
+2 -1
View File
@@ -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) {