From aca3892b85d0817d84d09d527ab43f0f264cb716 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Mon, 3 Nov 2014 14:01:39 +0100
Subject: [PATCH] Subversion: Force deletion of files
vcsDelete(...) is used after a file is already deleted from the
filesystem (and after asking the user), so it is safe to --force
the removal in svn.
Task-number: QTCREATORBUG-13271
Change-Id: Id3c076987f6518efb186a04d31855b189cfd52ab
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
src/plugins/subversion/subversionplugin.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index 9ccc89bd780..c9d3d8b6a54 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -1089,8 +1089,8 @@ bool SubversionPlugin::vcsDelete(const QString &workingDir, const QString &rawFi
{
const QString file = QDir::toNativeSeparators(rawFileName);
- QStringList args(QLatin1String("delete"));
- args.push_back(file);
+ QStringList args;
+ args << QLatin1String("delete") << QLatin1String("--force") << file;
const SubversionResponse response =
runSvn(workingDir, args, m_settings.timeOutMs(),
--
GitLab