diff options
Diffstat (limited to 'bundles/org.eclipse.team.core/src/org/eclipse/team/core/sync/RemoteSyncElement.java')
| -rw-r--r-- | bundles/org.eclipse.team.core/src/org/eclipse/team/core/sync/RemoteSyncElement.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/sync/RemoteSyncElement.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/sync/RemoteSyncElement.java index 60289a589..2222f1d59 100644 --- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/sync/RemoteSyncElement.java +++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/sync/RemoteSyncElement.java @@ -217,11 +217,10 @@ public abstract class RemoteSyncElement extends LocalSyncElement implements IRem description = OUTGOING | CHANGE; } else { description = CONFLICTING | CHANGE; - } - if (description != IN_SYNC && - granularity == RemoteSyncElement.GRANULARITY_CONTENTS && - compare(granularity, true, local, remote, Policy.subMonitorFor(progress, 30))) { - description |= PSEUDO_CONFLICT; + if (granularity == RemoteSyncElement.GRANULARITY_CONTENTS && + compare(granularity, true, local, remote, Policy.subMonitorFor(progress, 30))) { + description |= PSEUDO_CONFLICT; + } } progress.done(); } |