]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
stupid mistakes
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Sun, 19 Mar 2006 19:29:41 +0000 (19:29 +0000)
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Sun, 19 Mar 2006 19:29:41 +0000 (19:29 +0000)
ikiwiki

diff --git a/ikiwiki b/ikiwiki
index db0056aa4dcad553704468fe90aac778534a647a..70ede428852d2048609dfafd38c5a75b9270bf6f 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -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;