From c0cd40529bcf74c2bbaa88df054886c8176d0ab7 Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sun, 30 Oct 2005 19:06:08 +0000 Subject: [PATCH] Fixed SD2-510: Deleting a file with local modifications git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@660 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Project/Src/Commands/AutostartCommands.cs | 9 +++++++-- .../Src/Gui/Pads/ProjectBrowser/ProjectBrowserControl.cs | 8 ++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/AutostartCommands.cs b/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/AutostartCommands.cs index bcd64f6ee3..059a41fe16 100644 --- a/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/AutostartCommands.cs +++ b/src/AddIns/Misc/SubversionAddIn/Project/Src/Commands/AutostartCommands.cs @@ -111,8 +111,13 @@ namespace ICSharpCode.Svn.Commands break; case StatusKind.Modified: case StatusKind.Replaced: - MessageService.ShowError("The file has local modifications. Do you really want to remove it?"); - e.Cancel = true; + if (MessageService.AskQuestion("The file has local modifications. Do you really want to remove it?")) { + // modified files cannot be deleted, so we need to revert the changes first + SvnClient.Instance.Client.Revert(new string[] { fullName }, e.IsDirectory); + } else { + e.Cancel = true; + return; + } break; case StatusKind.Added: if (status.Copied) { diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserControl.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserControl.cs index e3c2c5d94f..999ee6bf33 100644 --- a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserControl.cs +++ b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserControl.cs @@ -61,8 +61,8 @@ namespace ICSharpCode.SharpDevelop.Project { InitializeComponent(); treeView.BeforeSelect += TreeViewBeforeSelect; - FileService.FileRenaming += FileServiceFileRenaming; - FileService.FileRemoving += FileServiceFileRemoving; + FileService.FileRenamed += FileServiceFileRenamed; + FileService.FileRemoved += FileServiceFileRemoved; ProjectService.ProjectItemAdded += ProjectServiceProjectItemAdded; ProjectService.SolutionFolderRemoved += ProjectServiceSolutionFolderRemoved; @@ -100,12 +100,12 @@ namespace ICSharpCode.SharpDevelop.Project } } - void FileServiceFileRemoving(object sender, FileEventArgs e) + void FileServiceFileRemoved(object sender, FileEventArgs e) { CallVisitor(new FileRemoveTreeNodeVisitor(e.FileName)); } - void FileServiceFileRenaming(object sender, FileRenameEventArgs e) + void FileServiceFileRenamed(object sender, FileRenameEventArgs e) { CallVisitor(new FileRenameTreeNodeVisitor(e.SourceFile, e.TargetFile)); }