diff options
| author | Jean Michel-Lemieux | 2003-08-08 15:19:55 +0000 |
|---|---|---|
| committer | Jean Michel-Lemieux | 2003-08-08 15:19:55 +0000 |
| commit | 83665bbb4c3042f5c7dd01b97aa19c870a6d81f3 (patch) | |
| tree | 058061c75bcd549186480cf7051fba6810fcbbdf | |
| parent | 2f7e7a289b6258b076803078002ebcfe9828f9bc (diff) | |
| download | eclipse.platform.team-83665bbb4c3042f5c7dd01b97aa19c870a6d81f3.tar.gz eclipse.platform.team-83665bbb4c3042f5c7dd01b97aa19c870a6d81f3.tar.xz eclipse.platform.team-83665bbb4c3042f5c7dd01b97aa19c870a6d81f3.zip | |
Disable 'override and commit' on outgoing changes.
| -rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndCommitAction.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndCommitAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndCommitAction.java index ced35e588..aa7002f89 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndCommitAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/OverrideAndCommitAction.java @@ -21,7 +21,7 @@ public class OverrideAndCommitAction extends SubscriberCommitAction { * @see org.eclipse.team.ui.sync.SubscriberAction#getSyncInfoFilter() */ protected SyncInfoFilter getSyncInfoFilter() { - return new SyncInfoDirectionFilter(new int[] {SyncInfo.CONFLICTING, SyncInfo.OUTGOING, SyncInfo.INCOMING}); + return new SyncInfoDirectionFilter(new int[] {SyncInfo.CONFLICTING, SyncInfo.INCOMING}); } protected boolean promptForConflictHandling(SyncInfoSet syncSet) { |