Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2006-01-26 16:40:30 +0000
committerMichael Valenta2006-01-26 16:40:30 +0000
commit1a0c120be0fee1bce3fc83e202ff6f7b5db324c1 (patch)
tree1216fcb994f1ae3ccae2231f5a4faecc09369395
parente069d980e4ef1ec597f26096d583e0bc2420b322 (diff)
downloadeclipse.platform.team-1a0c120be0fee1bce3fc83e202ff6f7b5db324c1.tar.gz
eclipse.platform.team-1a0c120be0fee1bce3fc83e202ff6f7b5db324c1.tar.xz
eclipse.platform.team-1a0c120be0fee1bce3fc83e202ff6f7b5db324c1.zip
Conflicts didn' show during an update
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DiffTreeChangesSection.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DiffTreeChangesSection.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DiffTreeChangesSection.java
index 386e7da99..56728274c 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DiffTreeChangesSection.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/DiffTreeChangesSection.java
@@ -42,15 +42,19 @@ public class DiffTreeChangesSection extends ForwardingChangesSection implements
protected long getChangesInMode(int candidateMode) {
long numChanges;
+ long numConflicts = context.getDiffTree().countFor(IThreeWayDiff.CONFLICTING, IThreeWayDiff.DIRECTION_MASK);
switch (candidateMode) {
+ case ISynchronizePageConfiguration.CONFLICTING_MODE:
+ numChanges = numConflicts;
+ break;
case ISynchronizePageConfiguration.OUTGOING_MODE:
- numChanges = context.getDiffTree().countFor(IThreeWayDiff.OUTGOING, IThreeWayDiff.DIRECTION_MASK);
+ numChanges = numConflicts + context.getDiffTree().countFor(IThreeWayDiff.OUTGOING, IThreeWayDiff.DIRECTION_MASK);
break;
case ISynchronizePageConfiguration.INCOMING_MODE:
- numChanges = context.getDiffTree().countFor(IThreeWayDiff.INCOMING, IThreeWayDiff.DIRECTION_MASK);
+ numChanges = numConflicts + context.getDiffTree().countFor(IThreeWayDiff.INCOMING, IThreeWayDiff.DIRECTION_MASK);
break;
case ISynchronizePageConfiguration.BOTH_MODE:
- numChanges = context.getDiffTree().countFor(IThreeWayDiff.INCOMING, IThreeWayDiff.DIRECTION_MASK)
+ numChanges = numConflicts + context.getDiffTree().countFor(IThreeWayDiff.INCOMING, IThreeWayDiff.DIRECTION_MASK)
+ context.getDiffTree().countFor(IThreeWayDiff.OUTGOING, IThreeWayDiff.DIRECTION_MASK);
break;
default:

Back to the top