commit 08054e1f482a36fec4c4b519699ae36f1c387bff
author Michael Valenta <mvalenta> Tue Nov 16 20:04:44 2004 +0000
committer Michael Valenta <mvalenta> Tue Nov 16 20:04:44 2004 +0000
tree 207c6b161438c71c755e0cfb6f3c38bec9d72bd9
parent 8daa269494e3cdc813c5b92dca1a93ab10d5d9cc

Bug 78770 Override and Update does nothing

bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/AbstractSynchronizeModelProvider.java

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 325e66a..62d287b 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 @@
             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())) {