urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stupid mistakes

master
joey 2006-03-19 19:29:41 +00:00
parent 52db4a50f6
commit 9b769c751a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ikiwiki
View File

@ -465,12 +465,12 @@ sub rcs_commit ($$) { #{{{
# Tries to commit the page; returns undef on _success_ and
# a version of the page with the rcs's conflict markers on failure.
# The file is relative to the srcdir.
my $message=shift;
my $file=shift;
my $message=shift;
if (-d "$config{srcdir}/.svn") {
# svn up to let svn merge in other changes
if (system("svn", "update", "$config{srcdir}/$file") != 0) {
if (system("svn", "update", "-quiet", "$config{srcdir}/$file") != 0) {
warn("svn update failed\n");
}
if (system("svn", "commit", "--quiet", "-m",
@ -478,7 +478,7 @@ sub rcs_commit ($$) { #{{{
"$config{srcdir}/$file") != 0) {
warn("svn commit failed\n");
my $conflict=readfile("$config{srcdir}/$file");
if (system("svn", "revert", "$config{srcdir}/$file") != 0) {
if (system("svn", "revert", "--quiet", "$config{srcdir}/$file") != 0) {
warn("svn revert failed\n");
}
return $conflict;