diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-16 08:47:53 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-09-16 08:47:53 +0000 |
| commit | 32d416db0db4e445d8156885aae9c6b26ce56c56 (patch) | |
| tree | 75b2753f261fe76418c2fe963f59aa424bbd651a | |
| parent | c278c84692c17f3d83fa3acfe39f2a2564dced0d (diff) | |
| download | ruby-32d416db0db4e445d8156885aae9c6b26ce56c56.tar.gz | |
* tool/change_maker.rb: Update svn detection for subversion 1.7's
single .svn directory.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36982 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | tool/change_maker.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -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") |