diff options
| author | Jean Michel-Lemieux | 2002-05-02 14:39:14 +0000 |
|---|---|---|
| committer | Jean Michel-Lemieux | 2002-05-02 14:39:14 +0000 |
| commit | 42e52e4ea20b3a2e78686d9e7f9509a2f1ffdf65 (patch) | |
| tree | 5e37b0bbcaecd866505a13282984e9c1e2be547d | |
| parent | 1a0f051797287aa9db14ebeac55dcdb98124ff76 (diff) | |
| download | eclipse.platform.team-42e52e4ea20b3a2e78686d9e7f9509a2f1ffdf65.tar.gz eclipse.platform.team-42e52e4ea20b3a2e78686d9e7f9509a2f1ffdf65.tar.xz eclipse.platform.team-42e52e4ea20b3a2e78686d9e7f9509a2f1ffdf65.zip | |
Only conflicts can be pseudo-conflict
| -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(); } |