diff options
| author | Jean Michel-Lemieux | 2004-03-23 21:26:18 +0000 |
|---|---|---|
| committer | Jean Michel-Lemieux | 2004-03-23 21:26:18 +0000 |
| commit | 40c6f751b9b54e3f7ad09d20104a27019e757f51 (patch) | |
| tree | 3991ae2e568798e992bbb7c6b54d2f82b2ce68a8 | |
| parent | 8c1d5b71e9c5f13a81758786de632b1f7e05510d (diff) | |
| download | eclipse.platform.team-40c6f751b9b54e3f7ad09d20104a27019e757f51.tar.gz eclipse.platform.team-40c6f751b9b54e3f7ad09d20104a27019e757f51.tar.xz eclipse.platform.team-40c6f751b9b54e3f7ad09d20104a27019e757f51.zip | |
Bug 55422 Conflict mark does not disappear from project
| -rw-r--r-- | bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelProvider.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelProvider.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelProvider.java index 0b58113eb..687ff2d7f 100644 --- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelProvider.java +++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/SynchronizeModelProvider.java @@ -441,7 +441,7 @@ public abstract class SynchronizeModelProvider implements ISyncInfoSetChangeList } protected void calculateProperties(ISynchronizeModelElement element, boolean clear) { - element.setPropertyToRoot(ISynchronizeModelElement.PROPAGATED_CONFLICT_PROPERTY, isConflicting(element)); + element.setPropertyToRoot(ISynchronizeModelElement.PROPAGATED_CONFLICT_PROPERTY, clear ? false : isConflicting(element)); propagateProblemMarkers(element, clear); updateParentLabels(element); } |