Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2004-11-16 20:04:44 +0000
committerMichael Valenta2004-11-16 20:04:44 +0000
commit08054e1f482a36fec4c4b519699ae36f1c387bff (patch)
tree207c6b161438c71c755e0cfb6f3c38bec9d72bd9
parent8daa269494e3cdc813c5b92dca1a93ab10d5d9cc (diff)
downloadeclipse.platform.team-08054e1f482a36fec4c4b519699ae36f1c387bff.tar.gz
eclipse.platform.team-08054e1f482a36fec4c4b519699ae36f1c387bff.tar.xz
eclipse.platform.team-08054e1f482a36fec4c4b519699ae36f1c387bff.zip
Bug 78770 Override and Update does nothingI20041116
-rw-r--r--bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java
index 325e66ac2..62d287b7a 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java
@@ -753,7 +753,8 @@ public abstract class AbstractSynchronizeModelProvider implements ISynchronizeMo
ISynchronizeModelElement node = nodes[i];
ISynchronizeModelElement rootToClear = getRootToClear(node);
propogateConflictState(rootToClear, true /* clear the conflict */);
- clearModelObjects(rootToClear);
+ clearModelObjects(rootToClear);
+ rootsToClear.add(rootToClear);
}
ISynchronizeModelElement[] roots = (ISynchronizeModelElement[]) rootsToClear.toArray(new ISynchronizeModelElement[rootsToClear.size()]);
if (Utils.canUpdateViewer(getViewer())) {

Back to the top