9277: Localy modified files are not moved to a branch

2 files changed, 53 insertions, 0 deletions

diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java
index 3f336125e..11be5f786 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Command.java
@@ -90,6 +90,7 @@ public abstract class Command {
 		registerResponseHandler(new CheckedInHandler());
 		registerResponseHandler(new CopyHandler());
 		registerResponseHandler(new ModTimeHandler());
+		registerResponseHandler(new NewEntryHandler());
 		registerResponseHandler(new RemovedHandler());
 		registerResponseHandler(new RemoveEntryHandler());
 		registerResponseHandler(new StaticHandler(true));
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NewEntryHandler.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NewEntryHandler.java
new file mode 100644
index 000000000..81cad83c2
--- /dev/null
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/NewEntryHandler.java
@@ -0,0 +1,52 @@
+package org.eclipse.team.internal.ccvs.core.client;
+
+/*
+ * (c) Copyright IBM Corp. 2000, 2002.
+ * All Rights Reserved.
+ */
+
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.team.internal.ccvs.core.CVSException;
+import org.eclipse.team.internal.ccvs.core.resources.ICVSFile;
+import org.eclipse.team.internal.ccvs.core.resources.ICVSFolder;
+import org.eclipse.team.internal.ccvs.core.syncinfo.ResourceSyncInfo;
+
+/**
+ * @version 	1.0
+ * @author
+ */
+public class NewEntryHandler extends ResponseHandler {
+
+	/*
+	 * @see ResponseHandler#getResponseID()
+	 */
+	public String getResponseID() {
+		return "New-entry";
+	}
+
+	/*
+	 * @see ResponseHandler#handle(Session, String, IProgressMonitor)
+	 */
+	public void handle(Session session, String localDir, IProgressMonitor monitor)
+		throws CVSException {
+			
+		// read additional data for the response
+		String repositoryFile = session.readLine();
+		String entryLine = session.readLine();
+		
+		// Clear the recorded mod-time
+		session.setModTime(null);
+		
+		// Get the local file		
+		String fileName = repositoryFile.substring(repositoryFile.lastIndexOf("/") + 1); //$NON-NLS-1$
+		ICVSFolder mParent = session.getLocalRoot().getFolder(localDir);
+		ICVSFile mFile = mParent.getFile(fileName);
+
+		ResourceSyncInfo fileInfo = mFile.getSyncInfo();
+		ResourceSyncInfo newInfo = new ResourceSyncInfo(entryLine, fileInfo.getPermissions(), ResourceSyncInfo.DUMMY_TIMESTAMP);
+		mFile.setSyncInfo(newInfo);
+
+
+	}
+
+}