Bug 132255 Merge corrupted imageI200604130005

1 files changed, 5 insertions, 4 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 7fb5a8fdb..c1982bd16 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
@@ -13,9 +13,7 @@ package org.eclipse.team.internal.ccvs.core.resources;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
@@ -127,7 +125,10 @@ public class RemoteFile extends RemoteResource implements ICVSRemoteFile  {
 			revision = ResourceSyncInfo.ADDED_REVISION;
 		}
 		if (keywordMode == null) {
-			keywordMode = KSubstOption.getDefaultTextMode();
+			// Always use a blank mode for remote files so that 
+			// the proper mode will be obtained when the contents
+			// are fetched
+			keywordMode = KSubstOption.fromMode(""); //$NON-NLS-1$
 		}
 		MutableResourceSyncInfo newInfo = new MutableResourceSyncInfo(name, revision);		
 		newInfo.setKeywordMode(keywordMode);