foo

[git.ikiwiki.info.git] / ikiwiki

diff --git a/ikiwiki b/ikiwiki
index 9e22d1dbcc34bd8d6d78b3886a65ede79c691b52..d64a3417a5fca6827a1c6d7c4eb234dee18d1e23 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -350,10 +350,16 @@ sub rcs_commit ($) {
        }
 }
 
-sub rcs_ad ($) {
+sub rcs_add ($) {
        my $file=shift;
 
        if (-d "$srcdir/.svn") {
+               my $parent=dirname($file);
+               while (! -d "$srcdir/$parent/.svn") {
+                       $file=$parent;
+                       $parent=dirname($file);
+               }
+               
                if (system("svn", "add", "--quiet", $file) != 0) {
                        warn("svn add failed\n");
                }
@@ -605,11 +611,11 @@ sub cgi () {
                }
                else {
                        my $dir=$from."/";
-                       $dir=~s/[^/]+\/$//;
+                       $dir=~s![^/]+/$!!;
                        push @page_locs, $dir.$page;
                        push @page_locs, "$from/$page";
                        while (length $dir) {
-                               $dir=~s/[^/]+\/$//;
+                               $dir=~s![^/]+/$!!;
                                push @page_locs, $dir.$page;
                        }
                }