diff options
| author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-12 07:33:09 +0000 |
|---|---|---|
| committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-12 07:33:09 +0000 |
| commit | 24dbd1979108d3ca95aa4e86e56e5d6dd922b835 (patch) | |
| tree | 851ee97d8bc798806904df3d9f32b1de3061e740 | |
| parent | 0d0344c1f0f912ad048406762c6518cf997237b3 (diff) | |
| download | ruby-24dbd1979108d3ca95aa4e86e56e5d6dd922b835.tar.gz | |
* tool/merger.rb (#default_merge_branch): Add support for
Subversion 1.7 which adopted a whole new working directory
structure.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | tool/merger.rb | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Sun Feb 12 16:30:23 2012 Akinori MUSHA <knu@iDaemons.org> + + * tool/merger.rb (#default_merge_branch): Add support for + Subversion 1.7 which adopted a whole new working directory + structure. + Sun Feb 12 15:14:41 2012 Kazuki Tsujimoto <kazuki@callcc.net> * benchmark/driver.rb: suppress unused/shadowing variable warnings. diff --git a/tool/merger.rb b/tool/merger.rb index d8ae16016b..6f82541e0d 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -112,7 +112,7 @@ def tag intv_p = false end def default_merge_branch - /branches\/ruby_1_8_/ =~ IO.binread(".svn/entries", 100) ? 'branches/ruby_1_8' : 'trunk' + %r{^URL: .*/branches/ruby_1_8_} =~ `svn info` ? 'branches/ruby_1_8' : 'trunk' end case ARGV[0] |