diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangesCacheFile.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangesCacheFile.java index 4da219207c27..2cab2ce6f96a 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangesCacheFile.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/ChangesCacheFile.java @@ -41,7 +41,7 @@ import java.util.*; */ public class ChangesCacheFile { private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vcs.changes.committed.ChangesCacheFile"); - private static final int VERSION = 6; + private static final int VERSION = 7; private final File myPath; private final File myIndexPath; diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnChangeList.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnChangeList.java index 1e2d66ab3a9e..8666df90b99f 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnChangeList.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnChangeList.java @@ -145,6 +145,7 @@ public class SvnChangeList implements CommittedChangeList { final boolean supportsReplaced) throws IOException { myVcs = vcs; myLocation = location; + myKnownAsDirectories = new HashSet(); readFromStream(stream, supportsCopyFromInfo, supportsReplaced); myCommonPathSearcher = new CommonPathSearcher(); for (String path : myAddedPaths) { @@ -156,7 +157,6 @@ public class SvnChangeList implements CommittedChangeList { for (String path : myChangedPaths) { myCommonPathSearcher.next(path); } - myKnownAsDirectories = new HashSet(0); } public Change getByPath(final String path) { @@ -632,6 +632,11 @@ public class SvnChangeList implements CommittedChangeList { writeFiles(stream, myDeletedPaths); writeMap(stream, myCopiedAddedPaths); writeFiles(stream, myReplacedPaths); + + stream.writeInt(myKnownAsDirectories.size()); + for (String directory : myKnownAsDirectories) { + stream.writeUTF(directory); + } } // to be able to update plugin only @@ -670,6 +675,11 @@ public class SvnChangeList implements CommittedChangeList { if (supportsReplaced) { readFiles(stream, myReplacedPaths); } + + final int size = stream.readInt(); + for (int i = 0; i < size; i++) { + myKnownAsDirectories.add(stream.readUTF()); + } } private static void writeMap(final DataOutput stream, final Map map) throws IOException {