stupid mistakes
parent
52db4a50f6
commit
9b769c751a
6
ikiwiki
6
ikiwiki
|
@ -465,12 +465,12 @@ sub rcs_commit ($$) { #{{{
|
||||||
# Tries to commit the page; returns undef on _success_ and
|
# Tries to commit the page; returns undef on _success_ and
|
||||||
# a version of the page with the rcs's conflict markers on failure.
|
# a version of the page with the rcs's conflict markers on failure.
|
||||||
# The file is relative to the srcdir.
|
# The file is relative to the srcdir.
|
||||||
my $message=shift;
|
|
||||||
my $file=shift;
|
my $file=shift;
|
||||||
|
my $message=shift;
|
||||||
|
|
||||||
if (-d "$config{srcdir}/.svn") {
|
if (-d "$config{srcdir}/.svn") {
|
||||||
# svn up to let svn merge in other changes
|
# 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");
|
warn("svn update failed\n");
|
||||||
}
|
}
|
||||||
if (system("svn", "commit", "--quiet", "-m",
|
if (system("svn", "commit", "--quiet", "-m",
|
||||||
|
@ -478,7 +478,7 @@ sub rcs_commit ($$) { #{{{
|
||||||
"$config{srcdir}/$file") != 0) {
|
"$config{srcdir}/$file") != 0) {
|
||||||
warn("svn commit failed\n");
|
warn("svn commit failed\n");
|
||||||
my $conflict=readfile("$config{srcdir}/$file");
|
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");
|
warn("svn revert failed\n");
|
||||||
}
|
}
|
||||||
return $conflict;
|
return $conflict;
|
||||||
|
|
Loading…
Reference in New Issue