diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-07-19 12:36:01 +0200 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-07-19 12:36:01 +0200 |
| commit | ec965fc92cd41f597c6e8e88584b9a688407c8c6 (patch) | |
| tree | 410173c14f66ae62a6436ea00b73bb470c9d1dda /IkiWiki/Plugin/svn.pm | |
| parent | 86edd73d169600875a10a635ef8df4a644545b0d (diff) | |
| parent | fa2c3a3dba2a4589b63cf445ec9e33ec19be627e (diff) | |
| download | ikiwiki-ec965fc92cd41f597c6e8e88584b9a688407c8c6.tar ikiwiki-ec965fc92cd41f597c6e8e88584b9a688407c8c6.tar.gz | |
Merge branch 'master' into po
Conflicts:
debian/changelog
Diffstat (limited to 'IkiWiki/Plugin/svn.pm')
| -rw-r--r-- | IkiWiki/Plugin/svn.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/svn.pm b/IkiWiki/Plugin/svn.pm index fe55e7d08..06b987f51 100644 --- 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 - my $parent=dirname($dest); + my $parent=IkiWiki::dirname($dest); 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"); |