Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjames2002-03-19 15:36:01 -0500
committerjames2002-03-19 15:36:01 -0500
commitb425113deb81f68d50f7545cc1f23522f694f7b9 (patch)
treec02426c655be0c457695d963372f2dd8121c57b4
parentb721efb63448777692a843fb4000363e3a294de5 (diff)
downloadeclipse.platform.team-b425113deb81f68d50f7545cc1f23522f694f7b9.tar.gz
eclipse.platform.team-b425113deb81f68d50f7545cc1f23522f694f7b9.tar.xz
eclipse.platform.team-b425113deb81f68d50f7545cc1f23522f694f7b9.zip
Make update with join action work on conflicts again
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/UpdateWithForcedJoinAction.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/UpdateWithForcedJoinAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/UpdateWithForcedJoinAction.java
index f510e47e9..83d2ff585 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/UpdateWithForcedJoinAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge/UpdateWithForcedJoinAction.java
@@ -14,6 +14,7 @@ import org.eclipse.team.internal.ccvs.core.util.Assert;
import org.eclipse.team.internal.ccvs.ui.RepositoryManager;
import org.eclipse.team.internal.ccvs.ui.sync.CVSSyncCompareInput;
import org.eclipse.team.ui.sync.ITeamNode;
+import org.eclipse.team.ui.sync.SyncSet;
/*
* Used only in the merge editor. This action allows the user to select a single conflict and use
@@ -70,4 +71,11 @@ public class UpdateWithForcedJoinAction extends UpdateMergeAction {
// don't prompt for overriding conflicts, because this action is simply merging and creating a backup copy of the original file.
return true;
}
+
+ /*
+ * Override removeNonApplicableNodes because conflicting nodes should not be removed from this set.
+ */
+ protected void removeNonApplicableNodes(SyncSet set, int syncMode) {
+ set.removeOutgoingNodes();
+ }
}

Back to the top