fix subpage creation
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Mon, 20 Mar 2006 05:51:22 +0000 (05:51 +0000)
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Mon, 20 Mar 2006 05:51:22 +0000 (05:51 +0000)
ikiwiki

diff --git a/ikiwiki b/ikiwiki
index d727d904a95551efd4657694c4ea34c80f2502eb..d1a31eb551fe2afdab4c7ccbd9388190097f3200 100755 (executable)
--- a/ikiwiki
+++ b/ikiwiki
@@ -489,7 +489,7 @@ sub rcs_commit ($$$) { #{{{
                # else since rcs_prepedit was called.
                my ($oldrev)=$rcstoken=~/^([0-9]+)$/; # untaint
                my $rev=svn_info("Revision", "$config{srcdir}/$file");
-               if ($rev != $oldrev) {
+               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
@@ -501,7 +501,7 @@ sub rcs_commit ($$$) { #{{{
 
                if (system("svn", "commit", "--quiet", "-m",
                           possibly_foolish_untaint($message),
-                          "$config{srcdir}/$file") != 0) {
+                          "$config{srcdir}") != 0) {
                        my $conflict=readfile("$config{srcdir}/$file");
                        if (system("svn", "revert", "--quiet", "$config{srcdir}/$file") != 0) {
                                warn("svn revert failed\n");