diff options
| author | Tomasz Zarna | 2011-11-23 16:49:54 +0000 |
|---|---|---|
| committer | Tomasz Zarna | 2011-11-23 16:49:54 +0000 |
| commit | 1d317a8da6b135518fc0f27e059e2d38a94760f8 (patch) | |
| tree | 9d482d8a972f45a982ebacf13fbe330be5929a71 /bundles/org.eclipse.team.cvs.ui/src | |
| parent | 951477fe0d9d1aa4bbfcabd936d0d7641c6f712a (diff) | |
| download | eclipse.platform.team-1d317a8da6b135518fc0f27e059e2d38a94760f8.tar.gz eclipse.platform.team-1d317a8da6b135518fc0f27e059e2d38a94760f8.tar.xz eclipse.platform.team-1d317a8da6b135518fc0f27e059e2d38a94760f8.zip | |
bug 364561: test failures due to unexpected outgoing changesv20111123-1649
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src')
| -rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceSynchronizeParticipant.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceSynchronizeParticipant.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceSynchronizeParticipant.java index b5c219103..ddc62a111 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceSynchronizeParticipant.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/WorkspaceSynchronizeParticipant.java @@ -206,6 +206,9 @@ public class WorkspaceSynchronizeParticipant extends ScopableSubscriberParticipa private SyncInfoFilter contentComparison = new SyncInfoFilter() { private SyncInfoFilter contentCompare = new SyncInfoFilter.ContentComparisonSyncInfoFilter(); public boolean select(SyncInfo info, IProgressMonitor monitor) { + IResource local = info.getLocal(); + // don't select folders + if (local.getType() != IResource.FILE) return false; // Want to select infos whose contents do not match return !contentCompare.select(info, monitor); } |