IDEA-128131 Do not process parent of dirty directory while collecting local changes

This fix is essentially revert of commit 07c6409, which was used to fix IDEA-94845. Currently IDEA-94845 is not reproduced even after such revert.
This commit is contained in:
Konstantin Kolosovsky
2014-08-12 19:53:36 +04:00
parent 6ac9448652
commit 859286d47b
2 changed files with 7 additions and 4 deletions
@@ -55,10 +55,12 @@ public class SvnScopeZipper implements Runnable {
}
}
}
final FilePath parent = file.getParentPath();
if (parent != null) {
final MyDirNonRecursive item = createOrGet(parent);
item.add(file);
else {
final FilePath parent = file.getParentPath();
if (parent != null) {
final MyDirNonRecursive item = createOrGet(parent);
item.add(file);
}
}
}
}
@@ -145,6 +145,7 @@ public abstract class AbstractSvnUpdateIntegrateEnvironment implements UpdateEnv
}
public void onRefreshFilesCompleted() {
// TODO: why do we need to mark all roots as dirty here???
dirtyRoots();
for (Runnable groupWorker : myGroupWorkers) {