Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2003-08-19 11:47:43 -0400
committerJean Michel-Lemieux2003-08-19 11:47:43 -0400
commitf79be2546048a908f5febd25e9edc473df17ffe9 (patch)
tree02abca74889f16a0ceef71567611ad19c1e97ab3
parent713eea079e2632a4ae92efb6b10c9eff10003f6f (diff)
downloadeclipse.platform.team-f79be2546048a908f5febd25e9edc473df17ffe9.tar.gz
eclipse.platform.team-f79be2546048a908f5febd25e9edc473df17ffe9.tar.xz
eclipse.platform.team-f79be2546048a908f5febd25e9edc473df17ffe9.zip
Default the merge to use content comparison.
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java18
1 files changed, 9 insertions, 9 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java
index 78074e0b6..9e651c008 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java
@@ -29,6 +29,7 @@ import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.QualifiedName;
import org.eclipse.team.core.RepositoryProvider;
import org.eclipse.team.core.TeamException;
+import org.eclipse.team.core.subscribers.ContentComparisonCriteria;
import org.eclipse.team.core.subscribers.ITeamResourceChangeListener;
import org.eclipse.team.core.subscribers.SyncInfo;
import org.eclipse.team.core.subscribers.TeamDelta;
@@ -105,16 +106,15 @@ public class CVSMergeSubscriber extends CVSSyncTreeSubscriber implements IResour
String syncKeyPrefix = id.getLocalName();
remoteSynchronizer = new RemoteTagSynchronizer(syncKeyPrefix + end.getName(), end);
baseSynchronizer = new RemoteTagSynchronizer(syncKeyPrefix + start.getName(), start);
- mergedSynchronizer = new RemoteSynchronizer(syncKeyPrefix + "0merged");
+ mergedSynchronizer = new RemoteSynchronizer(syncKeyPrefix + "0merged"); //$NON-NLS-1$
- // TODO: must use revision comparison until bugs 40035 and 40129 are addressed
-// try {
-// setCurrentComparisonCriteria(ContentComparisonCriteria.ID_IGNORE_WS);
-// } catch (TeamException e) {
-// // use the default but log an exception because the content comparison should
-// // always be available.
-// CVSProviderPlugin.log(e);
-// }
+ try {
+ setCurrentComparisonCriteria(ContentComparisonCriteria.ID_IGNORE_WS);
+ } catch (TeamException e) {
+ // use the default but log an exception because the content comparison should
+ // always be available.
+ CVSProviderPlugin.log(e);
+ }
ResourcesPlugin.getWorkspace().addResourceChangeListener(this);
CVSProviderPlugin.getPlugin().getCVSWorkspaceSubscriber().addListener(this);

Back to the top