diff options
Diffstat (limited to 'bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/UpdateMergableOnly.java')
-rw-r--r-- | bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/UpdateMergableOnly.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/UpdateMergableOnly.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/UpdateMergableOnly.java index 407cfd392..84b28180d 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/UpdateMergableOnly.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/UpdateMergableOnly.java @@ -48,7 +48,7 @@ public class UpdateMergableOnly extends Update { String adjustedFileName = fileName; if (ResourceSyncInfo.isMergedWithConflicts(entryBytes)) { // for merged-with-conflict, return a temp file - adjustedFileName = ".##" + adjustedFileName; + adjustedFileName = ".##" + adjustedFileName; //$NON-NLS-1$ skippedFiles.add(((IContainer)mParent.getIResource()).getFile(new Path(fileName))); } return super.getTargetFile(mParent, adjustedFileName, entryBytes); @@ -90,10 +90,10 @@ public class UpdateMergableOnly extends Update { throws CVSException { MergableOnlyUpdatedHandler newHandler = new MergableOnlyUpdatedHandler(); - ResponseHandler oldHandler = getResponseHandler(newHandler.getResponseID()); + ResponseHandler oldHandler = session.getResponseHandler(newHandler.getResponseID()); skippedFiles.clear(); try { - registerResponseHandler(newHandler); + session.registerResponseHandler(newHandler); return super.doExecute( session, globalOptions, @@ -102,7 +102,7 @@ public class UpdateMergableOnly extends Update { listener, monitor); } finally { - registerResponseHandler(oldHandler); + session.registerResponseHandler(oldHandler); } } |