Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2002-01-18 21:06:05 +0000
committerJean Michel-Lemieux2002-01-18 21:06:05 +0000
commitcf7c811f7db1e50504cbf4674d3a005ac5b55726 (patch)
tree42e0400d6648f079fbad4657035623de7a5d3fb8
parent5f8ba5be2ce6593dbff58facfed485350b95f7d8 (diff)
downloadeclipse.platform.team-cf7c811f7db1e50504cbf4674d3a005ac5b55726.tar.gz
eclipse.platform.team-cf7c811f7db1e50504cbf4674d3a005ac5b55726.tar.xz
eclipse.platform.team-cf7c811f7db1e50504cbf4674d3a005ac5b55726.zip
Made mergeEntriesLog public, it seems that the cvs tests have specific tests
for that method. In addition, the compatibility tests must make use of it to clean up after running the external command line tool.
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/SyncFileUtil.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/SyncFileUtil.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/SyncFileUtil.java
index 0e0b56a0b..7b00620fc 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/SyncFileUtil.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/SyncFileUtil.java
@@ -255,7 +255,7 @@ public class SyncFileUtil {
return (String[]) fileContentStore.toArray(new String[fileContentStore.size()]);
}
- private static void mergeEntriesLogFiles(File root) throws CVSException {
+ public static void mergeEntriesLogFiles(File root) throws CVSException {
String FOLDER_TAG="D";
String ADD_TAG="A ";

Back to the top