Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
167508da
Commit
167508da
authored
May 05, 2009
by
Friedemann Kleint
Browse files
Added -non-interactive to svn update to avoid merge prompts.
parent
307470b2
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/subversion/subversionplugin.cpp
View file @
167508da
...
...
@@ -95,6 +95,8 @@ const char * const SubversionPlugin::STATUS = "Subversion.Status";
const
char
*
const
SubversionPlugin
::
UPDATE
=
"Subversion.Update"
;
const
char
*
const
SubversionPlugin
::
DESCRIBE
=
"Subversion.Describe"
;
static
const
char
*
nonInteractiveOptionC
=
"--non-interactive"
;
static
const
VCSBase
::
VCSBaseEditorParameters
editorParameters
[]
=
{
{
VCSBase
::
RegularCommandOutput
,
...
...
@@ -759,7 +761,7 @@ bool SubversionPlugin::commit(const QString &messageFile,
// "[ADM]<blanks>file" into an args list. The files of the status log
// can be relative or absolute depending on where the command was run.
QStringList
args
=
QStringList
(
QLatin1String
(
"commit"
));
args
<<
QLatin1String
(
"--
non
-i
nteractive
"
)
<<
QLatin1String
(
"--file"
)
<<
messageFile
;
args
<<
QLatin1String
(
non
I
nteractive
OptionC
)
<<
QLatin1String
(
"--file"
)
<<
messageFile
;
args
.
append
(
subVersionFileList
);
const
SubversionResponse
response
=
runSvn
(
args
,
subversionLongTimeOut
,
true
);
return
!
response
.
error
;
...
...
@@ -803,6 +805,7 @@ void SubversionPlugin::updateProject()
return
;
QStringList
args
(
QLatin1String
(
"update"
));
args
.
push_back
(
QLatin1String
(
nonInteractiveOptionC
));
args
.
append
(
topLevels
);
runSvn
(
args
,
subversionLongTimeOut
,
false
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment