Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2003-07-16 18:17:07 +0000
committerMichael Valenta2003-07-16 18:17:07 +0000
commit8b15a805dd48af6fd192ba77d9448fe9ed2a5904 (patch)
tree84a0cfc88d555bc751b8b387e4bcb9c38a8b9bfd
parent8e7ab769091e0d61c536361311a1cec0165bc316 (diff)
downloadeclipse.platform.team-8b15a805dd48af6fd192ba77d9448fe9ed2a5904.tar.gz
eclipse.platform.team-8b15a805dd48af6fd192ba77d9448fe9ed2a5904.tar.xz
eclipse.platform.team-8b15a805dd48af6fd192ba77d9448fe9ed2a5904.zip
40221: [Live Sync View] Conflicting deletion not cleared
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/RemoteTagSynchronizer.java24
1 files changed, 14 insertions, 10 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/RemoteTagSynchronizer.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/RemoteTagSynchronizer.java
index 7c977ee26..5c922889f 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/RemoteTagSynchronizer.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/syncinfo/RemoteTagSynchronizer.java
@@ -138,18 +138,22 @@ public class RemoteTagSynchronizer extends RemoteSynchronizer {
}
private IResource[] getLocalChildren(IResource local) throws TeamException {
- IResource[] localChildren;
- if( local.getType() != IResource.FILE && local.exists() ) {
- // TODO: This should be a list of all non-ignored resources including outgoing deletions
+ IResource[] localChildren = null;
+ if( local.getType() != IResource.FILE && (local.exists() || local.isPhantom())) {
+ // Include all non-ignored resources including outgoing deletions
ICVSFolder cvsFolder = CVSWorkspaceRoot.getCVSFolderFor((IContainer)local);
- ICVSResource[] cvsChildren = cvsFolder.members(ICVSFolder.MANAGED_MEMBERS | ICVSFolder.UNMANAGED_MEMBERS);
- List resourceChildren = new ArrayList();
- for (int i = 0; i < cvsChildren.length; i++) {
- ICVSResource cvsResource = cvsChildren[i];
- resourceChildren.add(cvsResource.getIResource());
+ // Look inside existing folders and phantoms that are CVS folders
+ if (local.exists() || cvsFolder.isCVSFolder()) {
+ ICVSResource[] cvsChildren = cvsFolder.members(ICVSFolder.MANAGED_MEMBERS | ICVSFolder.UNMANAGED_MEMBERS);
+ List resourceChildren = new ArrayList();
+ for (int i = 0; i < cvsChildren.length; i++) {
+ ICVSResource cvsResource = cvsChildren[i];
+ resourceChildren.add(cvsResource.getIResource());
+ }
+ localChildren = (IResource[]) resourceChildren.toArray(new IResource[resourceChildren.size()]);
}
- localChildren = (IResource[]) resourceChildren.toArray(new IResource[resourceChildren.size()]);
- } else {
+ }
+ if (localChildren == null) {
localChildren = new IResource[0];
}
return localChildren;

Back to the top