summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xtool/change_maker.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ef472344d..6d32fc11c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Sep 16 17:47:00 2012 Eric Hodel <drbrain@segment7.net>
+
+ * tool/change_maker.rb: Update svn detection for subversion 1.7's
+ single .svn directory.
+
Sun Sep 16 11:39:12 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (io_set_read_length): if the read length equals to the buffer
diff --git a/tool/change_maker.rb b/tool/change_maker.rb
index a4e44057fa..0ca195f77a 100755
--- a/tool/change_maker.rb
+++ b/tool/change_maker.rb
@@ -18,7 +18,7 @@ def diff2index(cmd, *argv)
lines.empty? ? nil : lines
end
-if File.directory?(".svn")
+if `svnversion` =~ /^\d+/
cmd = "svn diff --diff-cmd=diff -x-pU0"
change = diff2index(cmd, ARGV)
elsif File.directory?(".git")