Attachment 82974 Details for Bug 205784 – Patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch

patch#205784.txt (text/plain), 1.94 KB, created by Jakub Jurkiewicz

on 2007-11-15 11:16:51 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Jakub Jurkiewicz

Created: 2007-11-15 11:16:51 EST

Size: 1.94 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.team.cvs.core
>Index: src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java,v
>retrieving revision 1.192
>diff -u -r1.192 CVSTeamProvider.java
>--- src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java	16 Mar 2007 21:03:50 -0000	1.192
>+++ src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java	15 Nov 2007 16:05:36 -0000
>@@ -402,6 +402,14 @@
> 							// do it
> 							Session session = new Session(workspaceRoot.getRemoteLocation(), workspaceRoot.getLocalRoot(), true /* output to console */);
> 							session.open(Policy.subMonitorFor(monitor, 1), true /* open for modification */);
>+							
>+							//get KSubstOptions for the resources in case they have to be restored 
>+							ICVSResource[] icvsRecourcesArray = (ICVSResource[]) list.toArray(new ICVSResource[list.size()]);
>+							KSubstOption keySubstOptionsArray[] = new KSubstOption[list.size()];
>+							for (int i = 0; i < icvsRecourcesArray.length; i++) {
>+								keySubstOptionsArray[i] = icvsRecourcesArray[i].getSyncInfo().getKeywordMode();
>+							}
>+							
> 							try {
> 								result[0] = Command.ADMIN.execute(
> 									session,
>@@ -414,7 +422,15 @@
> 								session.close();
> 							}
> 							// if errors were encountered, abort
>-							if (! result[0].isOK()) return;
>+							if (! result[0].isOK()) { 
>+								//see bug #205784
>+								for (int i = 0; i < icvsRecourcesArray.length; i++) {
>+									ICVSFile mFile = CVSWorkspaceRoot.getCVSFileFor((IFile) icvsRecourcesArray[i].getIResource());
>+									mFile.setSyncBytes(ResourceSyncInfo.setKeywordMode(mFile.getSyncBytes(), keySubstOptionsArray[i]), ICVSFile.UNKNOWN);
>+								}
>+								return;
>+							
>+							}
> 						}
> 					} finally {
> 						monitor.done();

Actions: View | Diff

Attachments on bug 205784: 82974