Merge commit 'remotes/smcv/ready/remove-pagespec-merge'

[git.ikiwiki.info.git] / IkiWiki / Plugin / svn.pm

diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm
index fe55e7d0853a8ddcb78171fc3b6ffde3b62ad675..06b987f51ce756676aa977c2c95af0aa4628e952 100644 (file)
--- a/IkiWiki/Plugin/svn.pm
+++ b/IkiWiki/Plugin/svn.pm
@@ -243,10 +243,10 @@ sub rcs_rename ($$) {
        
        if (-d "$config{srcdir}/.svn") {
                # Add parent directory for $dest
        
        if (-d "$config{srcdir}/.svn") {
                # Add parent directory for $dest

-               my $parent=dirname($dest);
+               my $parent=IkiWiki::dirname($dest);

                if (! -d "$config{srcdir}/$parent/.svn") {
                        while (! -d "$config{srcdir}/$parent/.svn") {
                if (! -d "$config{srcdir}/$parent/.svn") {
                        while (! -d "$config{srcdir}/$parent/.svn") {

-                               $parent=dirname($dest);
+                               $parent=IkiWiki::dirname($dest);

                        }
                        if (system("svn", "add", "--quiet", "$config{srcdir}/$parent") != 0) {
                                warn("svn add $parent failed\n");
                        }
                        if (system("svn", "add", "--quiet", "$config{srcdir}/$parent") != 0) {
                                warn("svn add $parent failed\n");