From 5852305061d52dd8efc3e4b377b99ae44cf4975d Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 29 Jul 2009 08:48:21 +0200 Subject: [PATCH] Subversion: Fixed "add" with authentication for svn pre 1.5 The older versions do not accept --username option, omit it. Task-number: 255470 --- src/plugins/subversion/subversionsettings.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/plugins/subversion/subversionsettings.cpp b/src/plugins/subversion/subversionsettings.cpp index 8df4853667f..4c7d5818170 100644 --- a/src/plugins/subversion/subversionsettings.cpp +++ b/src/plugins/subversion/subversionsettings.cpp @@ -96,6 +96,10 @@ QStringList SubversionSettings::addOptions(const QStringList &args) const { if (!useAuthentication || user.isEmpty()) return args; + // SVN pre 1.5 does not accept "--userName" for "add", which is most likely + // an oversight. As no password is needed for the option, generally omit it. + if (!args.empty() && args.front() == QLatin1String("add")) + return args; QStringList rc; rc.push_back(QLatin1String(userNameOptionC));