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

IDEA-50300 CVS: after update with -A the previously switched file is shown as switched until Refresh

Browse Source 
thanks to Bas for help
This commit is contained in:
irengrig
2012-10-10 16:22:35 +04:00
parent 2f6dbc4e26
commit 96b7ab9ea4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/SwitchedFileHolder.java
+2 -2
View File
@@ -17,6 +17,7 @@ package com.intellij.openapi.vcs.changes;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.vcs.FilePathImpl;
import com.intellij.openapi.vfs.VfsUtil;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.PairProcessor;
@@ -48,8 +49,7 @@ public class SwitchedFileHolder extends RecursiveFileHolder<Pair<Boolean, String
protected boolean isFileDirty(final VcsDirtyScope scope, final VirtualFile file) {
if (scope == null) return true;
if (fileDropped(file)) return true;
final VirtualFile parent = file.getParent();
return (parent != null) && (scope.isRecursivelyDirty(parent));
return scope.belongsTo(new FilePathImpl(file));
}
public Map<VirtualFile, String> getFilesMapCopy() {