10737: #.somefile not deleted with Replace with->Remote

1 files changed, 8 insertions, 0 deletions

diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java
index af1a875e1..adc9605d8 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/PrepareForReplaceVisitor.java
@@ -70,6 +70,14 @@ public class PrepareForReplaceVisitor implements ICVSResourceVisitor {
 				files[i].accept(this);
 			}
 		}
+		// Also delete ignored child files that start with .#
+		ICVSResource[] ignoredFiles = folder.members(ICVSFolder.FILE_MEMBERS | ICVSFolder.IGNORED_MEMBERS);
+		for (int i = 0; i < ignoredFiles.length; i++) {
+			ICVSResource cvsResource = ignoredFiles[i];
+			if (cvsResource.getName().startsWith(".#")) {
+				cvsResource.delete();
+			}
+		}
 		monitor.worked(1);
 	}