Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2005-06-01 15:27:42 +0000
committerMichael Valenta2005-06-01 15:27:42 +0000
commit83ef29445c3a4bf2a8c80e2039a72e08bde0fd4c (patch)
tree888ca24bc6958c7c8ec8fbcfd476e42fbcf7f5ec
parent2ed88ca5fabc3758a4e7864df50a7a3736d78ba0 (diff)
downloadeclipse.platform.team-83ef29445c3a4bf2a8c80e2039a72e08bde0fd4c.tar.gz
eclipse.platform.team-83ef29445c3a4bf2a8c80e2039a72e08bde0fd4c.tar.xz
eclipse.platform.team-83ef29445c3a4bf2a8c80e2039a72e08bde0fd4c.zip
Bug 97818 entry in .cvsignore is not ignored on update/sync
-rw-r--r--bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/AbstractResourceVariantTree.java11
1 files changed, 1 insertions, 10 deletions
diff --git a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/AbstractResourceVariantTree.java b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/AbstractResourceVariantTree.java
index 53d70f5e5..807793002 100644
--- a/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/AbstractResourceVariantTree.java
+++ b/bundles/org.eclipse.team.core/src/org/eclipse/team/core/variants/AbstractResourceVariantTree.java
@@ -10,15 +10,7 @@
*******************************************************************************/
package org.eclipse.team.core.variants;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IResource;
@@ -175,7 +167,6 @@ public abstract class AbstractResourceVariantTree implements IResourceVariantTre
protected abstract boolean setVariant(IResource local, IResourceVariant remote) throws TeamException;
private void collectChanges(IResource local, IResourceVariant remote, Collection changedResources, int depth, IProgressMonitor monitor) throws TeamException {
- monitor.subTask(NLS.bind(Messages.AbstractResourceVariantTree_0, new String[] {local.getFullPath().toString()}));
boolean changed = setVariant(local, remote);
if (changed) {
changedResources.add(local);

Back to the top