From abe770805f8890124d0094c9f5fef79fe7ccbb6d Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Fri, 30 Mar 2012 16:12:50 +0400 Subject: [PATCH] IDEA-77303 File copying : "Overwriting" removes the file without creating new one Files for deletion are stored in myDeletedFiles with system dependent paths. (cherry picked from commit 178e08c) --- .../vcs-api/src/com/intellij/openapi/vcs/VcsVFSListener.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsVFSListener.java b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsVFSListener.java index 2e92cd784037..2378efaec35f 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsVFSListener.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsVFSListener.java @@ -23,6 +23,7 @@ import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; +import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vcs.actions.VcsContextFactory; import com.intellij.openapi.vcs.changes.ChangeListManager; import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager; @@ -444,12 +445,12 @@ public abstract class VcsVFSListener implements Disposable { } for (Iterator iter = myDeletedFiles.iterator(); iter.hasNext(); ) { - if (copiedAddedMoved.contains(iter.next().getPath())) { + if (copiedAddedMoved.contains(FileUtil.toSystemIndependentName(iter.next().getPath()))) { iter.remove(); } } for (Iterator iter = myDeletedWithoutConfirmFiles.iterator(); iter.hasNext(); ) { - if (copiedAddedMoved.contains(iter.next().getPath())) { + if (copiedAddedMoved.contains(FileUtil.toSystemIndependentName(iter.next().getPath()))) { iter.remove(); } }