]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - IkiWiki/Rcs/svn.pm
thoughts, responses
[git.ikiwiki.info.git] / IkiWiki / Rcs / svn.pm
index 30020c1fcc23958c9ad4a25fb8b5bb5ac123ca2e..af4641d3af00b713ea428dde0b1371c70e2a5b47 100644 (file)
@@ -85,9 +85,8 @@ sub rcs_commit ($$$;$$) { #{{{
                if (defined $rev && defined $oldrev && $rev != $oldrev) {
                        # Merge their changes into the file that we've
                        # changed.
-                       chdir($config{srcdir}); # svn merge wants to be here
                        if (system("svn", "merge", "--quiet", "-r$oldrev:$rev",
-                                  "$config{srcdir}/$file") != 0) {
+                                  "$config{srcdir}/$file", "$config{srcdir}/$file") != 0) {
                                warn("svn merge -r$oldrev:$rev failed\n");
                        }
                }
@@ -95,7 +94,7 @@ sub rcs_commit ($$$;$$) { #{{{
                if (system("svn", "commit", "--quiet", 
                           "--encoding", "UTF-8", "-m",
                           possibly_foolish_untaint($message),
-                          "$config{srcdir}") != 0) {
+                          $config{srcdir}) != 0) {
                        my $conflict=readfile("$config{srcdir}/$file");
                        if (system("svn", "revert", "--quiet", "$config{srcdir}/$file") != 0) {
                                warn("svn revert failed\n");