From 07c6409cbdb6ccfd5c52e697a92f1d193dbb9cea Mon Sep 17 00:00:00 2001 From: irengrig Date: Fri, 16 Nov 2012 17:55:42 +0400 Subject: [PATCH] IDEA-94845 Subversion: after shared project commit the top-level folders appear as locally deleted until Refresh [r=vasya] --- .../jetbrains/idea/svn/SvnNestedTypeRechecker.java | 1 + .../src/org/jetbrains/idea/svn/SvnScopeZipper.java | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnNestedTypeRechecker.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnNestedTypeRechecker.java index 0db34a993420..e7793c15e9b9 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnNestedTypeRechecker.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnNestedTypeRechecker.java @@ -83,6 +83,7 @@ public class SvnNestedTypeRechecker { if (! myRoots.isEmpty()) { initTravellingMap(); + // todo be very careful with this code since wrong statuses may be reported if file is not put into the map final ISVNStatusFileProvider fileProvider = new ISVNStatusFileProvider() { public Map getChildrenFiles(File parent) { final Map children = myTreeTravellingMap.get(FileUtil.nameToCompare(parent.getAbsolutePath())); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnScopeZipper.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnScopeZipper.java index 7b33613f0fa2..a5612a69172a 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnScopeZipper.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnScopeZipper.java @@ -52,12 +52,11 @@ public class SvnScopeZipper implements Runnable { me.add(new FilePathImpl(child)); } } - } else { - final FilePath parent = file.getParentPath(); - if (parent != null) { - final MyDirNonRecursive item = createOrGet(parent); - item.add(file); - } + } + final FilePath parent = file.getParentPath(); + if (parent != null) { + final MyDirNonRecursive item = createOrGet(parent); + item.add(file); } }