14578: Synchronize does not work for one class

1 files changed, 14 insertions, 0 deletions

diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java
index dcda548ba..520b4b63a 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFile.java
@@ -128,6 +128,12 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile  {
 		// forget local contents. Remote contents will be fetched the next time
 		// the returned handle is used.
 		file.clearContents();
+		
+		// If the revision changed, clear the contents of the original revision in case contents where cached
+		if ( ! info.getRevision().equals(file.getRevision())) {
+			RemoteFile originalRevision = new RemoteFile(parent, info);
+			originalRevision.clearContents();
+		}
 		return file;
 	}
 	
@@ -136,6 +142,14 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile  {
 	 */
 	public void clearContents() {
 		contents = null;
+		try {
+			File ioFile = CVSProviderPlugin.getPlugin().getCacheFileFor(getCacheRelativePath());
+			if (ioFile.exists()) {
+				ioFile.delete();
+			}
+		} catch (IOException e) {
+			CVSProviderPlugin.log(CVSException.wrapException(e).getStatus());
+		}
 	}
 		
 	/**