blob: 4c583270778e8cd0c8870fab66198567f4876914 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
|
/*******************************************************************************
* Copyright (c) 2000, 2003 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Common Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/cpl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.team.internal.ccvs.ui.subscriber;
import org.eclipse.team.ui.sync.SyncInfoSet;
public class OverrideAndCommitAction extends SubscriberCommitAction {
protected boolean promptForConflictHandling(SyncInfoSet syncSet) {
// If there is a conflict in the syncSet, we need to prompt the user before proceeding.
if (syncSet.hasConflicts() || syncSet.hasIncomingChanges()) {
switch (promptForConflicts(syncSet)) {
case 0:
// Yes, synchronize conflicts as well
break;
case 1:
// No, only synchronize non-conflicting changes.
syncSet.removeConflictingNodes();
syncSet.removeIncomingNodes();
break;
case 2:
default:
// Cancel
return false;
}
}
return true;
}
}
|