Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 205784
Collapse All | Expand All

(-)src/org/eclipse/team/internal/ccvs/core/CVSTeamProvider.java (-1 / +17 lines)
Lines 402-407 Link Here
402 
							// do it
 402 
							// do it
403 
							Session session = new Session(workspaceRoot.getRemoteLocation(), workspaceRoot.getLocalRoot(), true /* output to console */);
 403 
							Session session = new Session(workspaceRoot.getRemoteLocation(), workspaceRoot.getLocalRoot(), true /* output to console */);
404 
							session.open(Policy.subMonitorFor(monitor, 1), true /* open for modification */);
 404 
							session.open(Policy.subMonitorFor(monitor, 1), true /* open for modification */);
405
406 
							//get KSubstOptions for the resources in case they have to be restored
407 
							ICVSResource[] icvsRecourcesArray = (ICVSResource[]) list.toArray(new ICVSResource[list.size()]);
408 
							KSubstOption keySubstOptionsArray[] = new KSubstOption[list.size()];
409 
							for (int i = 0; i < icvsRecourcesArray.length; i++) {
410 
								keySubstOptionsArray[i] = icvsRecourcesArray[i].getSyncInfo().getKeywordMode();
411 
							}
412
405 
							try {
 413 
							try {
406 
								result[0] = Command.ADMIN.execute(
 414 
								result[0] = Command.ADMIN.execute(
407 
									session,
 415 
									session,
Lines 414-420 Link Here
414 
								session.close();
 422 
								session.close();
415 
							}
 423 
							}
416 
							// if errors were encountered, abort
 424 
							// if errors were encountered, abort
417 
							if (! result[0].isOK()) return;
 425 
							if (! result[0].isOK()) {
426 
								//see bug #205784
427 
								for (int i = 0; i < icvsRecourcesArray.length; i++) {
428 
									ICVSFile mFile = CVSWorkspaceRoot.getCVSFileFor((IFile) icvsRecourcesArray[i].getIResource());
429 
									mFile.setSyncBytes(ResourceSyncInfo.setKeywordMode(mFile.getSyncBytes(), keySubstOptionsArray[i]), ICVSFile.UNKNOWN);
430 
								}
431 
								return;
432
433 
							}
418 
						}
 434 
						}
419 
					} finally {
 435 
					} finally {
420 
						monitor.done();
 436 
						monitor.done();

Return to bug 205784