Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames2002-05-07 10:35:35 -0400
committerjames2002-05-07 10:35:35 -0400
commit6d38a51cb39b1b309b57f6f34e9be4ad00215d5b (patch)
tree2bdd467000ca8169dd8a21330e30b430b0334eaf
parent833a26917d817b679a4a4c6f137a2bb92e23a606 (diff)
downloadeclipse.platform.team-6d38a51cb39b1b309b57f6f34e9be4ad00215d5b.tar.gz
eclipse.platform.team-6d38a51cb39b1b309b57f6f34e9be4ad00215d5b.tar.xz
eclipse.platform.team-6d38a51cb39b1b309b57f6f34e9be4ad00215d5b.zip
*** empty log message ***
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/UpdateMergeAction.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/UpdateMergeAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/UpdateMergeAction.java
index 0512945ed..7cb8ea1ec 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/UpdateMergeAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/UpdateMergeAction.java
@@ -95,6 +95,9 @@ public class UpdateMergeAction extends UpdateSyncAction {
return nodes;
}
+ /*
+ * If called on a new folder, the folder will become an outgoing addition.
+ */
private void makeRemoteLocal(CVSRemoteSyncElement element, IProgressMonitor monitor) throws CVSException {
IRemoteResource remote = element.getRemote();
final IResource local = element.getLocal();
@@ -119,8 +122,6 @@ public class UpdateMergeAction extends UpdateSyncAction {
if(!local.exists()) {
((IFolder)local).create(false /*don't force*/, true /*local*/, monitor);
}
- // XXX This copies the tag from the remote (which is a branch tag)!!!
- // CVSWorkspaceRoot.getCVSFolderFor((IContainer)local).setFolderSyncInfo(((ICVSFolder)remote).getFolderSyncInfo());
} else {
monitor.beginTask(null, 200);
try {

Back to the top