Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Michel-Lemieux2003-08-19 15:30:58 -0400
committerJean Michel-Lemieux2003-08-19 15:30:58 -0400
commit0189fa16d174c2d832f71c2f922bbbccebc2c5a4 (patch)
treebe68c7ff7ccd1f03f5dfc66176334afaadd52b1a
parentb9ece82275b1fcd67eb620093feb38b4696783f6 (diff)
downloadeclipse.platform.team-0189fa16d174c2d832f71c2f922bbbccebc2c5a4.tar.gz
eclipse.platform.team-0189fa16d174c2d832f71c2f922bbbccebc2c5a4.tar.xz
eclipse.platform.team-0189fa16d174c2d832f71c2f922bbbccebc2c5a4.zip
Fixed enablement.
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateAction.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateAction.java
index 885849d79..10db9ebda 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndUpdateAction.java
@@ -10,6 +10,10 @@
*******************************************************************************/
package org.eclipse.team.internal.ccvs.ui.subscriber;
+import org.eclipse.team.core.subscribers.SyncInfo;
+import org.eclipse.team.ui.sync.SyncInfoDirectionFilter;
+import org.eclipse.team.ui.sync.SyncInfoFilter;
+
/**
* Runs an update command that will prompt the user for overwritting local
* changes to files that have non-mergeable conflicts. All the prompting logic
@@ -23,4 +27,10 @@ public class OverrideAndUpdateAction extends WorkspaceUpdateAction {
// allow overriding of local changes with this update
return true;
}
+ /* (non-Javadoc)
+ * @see org.eclipse.team.ui.sync.SubscriberAction#getSyncInfoFilter()
+ */
+ protected SyncInfoFilter getSyncInfoFilter() {
+ return new SyncInfoDirectionFilter(new int[] {SyncInfo.CONFLICTING, SyncInfo.OUTGOING});
+ }
}

Back to the top