Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-02-08 18:28:05 +0000
committerMichael Valenta2002-02-08 18:28:05 +0000
commit6e3dcf6ca6b671c0f802dd6183d7461a8aee2124 (patch)
tree8313b51ae8d6616e6beea61af477c672a43af4c3
parent859fd6676b91084bf491835fd3ee0f15600c3809 (diff)
downloadeclipse.platform.team-6e3dcf6ca6b671c0f802dd6183d7461a8aee2124.tar.gz
eclipse.platform.team-6e3dcf6ca6b671c0f802dd6183d7461a8aee2124.tar.xz
eclipse.platform.team-6e3dcf6ca6b671c0f802dd6183d7461a8aee2124.zip
9182: Out-of-sync CVS meta-files may be causing builder errors
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/SyncFileUtil.java18
1 files changed, 17 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 60f516a35..e92f4b7b9 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
@@ -13,11 +13,15 @@ import java.util.List;
import java.util.Map;
import java.util.TreeMap;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
import org.eclipse.team.ccvs.core.CVSTag;
import org.eclipse.team.internal.ccvs.core.CVSException;
+import org.eclipse.team.internal.ccvs.core.Policy;
import org.eclipse.team.internal.ccvs.core.resources.CVSEntryLineTag;
-import org.eclipse.team.internal.ccvs.core.syncinfo.*;
import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo;
import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo;
@@ -310,6 +314,18 @@ public class SyncFileUtil {
writeLines(entriesFile,(String[]) mergedEntries.values().toArray(new String[mergedEntries.size()]));
logEntriesFile.delete();
+
+ // Refresh the CVS directory containing the files
+ IResource resource = ResourcesPlugin.getWorkspace().getRoot().getContainerForLocation(new Path(getCVSSubdirectory(root).getAbsolutePath()));
+ try {
+ if(resource!=null) {
+ resource.refreshLocal(IResource.DEPTH_INFINITE, Policy.monitorFor(null));
+ }
+ } catch(CoreException e) {
+ // XXX Should we throw or log?
+ throw new CVSException(IStatus.ERROR, 0, "Error reloading sync information", e);
+ }
+
}
public static String[] readLines(File file) throws CVSException {

Back to the top