diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-01-28 00:06:01 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-01-28 00:06:01 +0000 |
| commit | c566e16d9ee1d925626b24bb84f497ffba88986a (patch) | |
| tree | fa28441137d7aa168c9a0a0a6ea139235a94f7b4 /IkiWiki | |
| parent | 62462ca5fbf273549f00a7936b10898cb611c528 (diff) | |
| download | ikiwiki-c566e16d9ee1d925626b24bb84f497ffba88986a.tar ikiwiki-c566e16d9ee1d925626b24bb84f497ffba88986a.tar.gz | |
* Improve use of svn merge, by specifying the file to merge, rather than
chdiring to the srcdir (which wasn't right when merging in a subdir).
Thanks Ethan.
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/Rcs/svn.pm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm index 87fd12fad..af4641d3a 100644 --- a/IkiWiki/Rcs/svn.pm +++ b/IkiWiki/Rcs/svn.pm @@ -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"); } } |