kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* tool/merger.rb (#default_merge_branch): Add support for

Browse source 
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
This commit is contained in:
knu 2012-02-12 07:33:09 +00:00
parent 0d0344c1f0
commit 24dbd19791
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> Sun Feb 12 15:14:41 2012 Kazuki Tsujimoto <kazuki@callcc.net>
* benchmark/driver.rb: suppress unused/shadowing variable warnings. * benchmark/driver.rb: suppress unused/shadowing variable warnings.

2
tool/merger.rb
View file

@ -112,7 +112,7 @@ def tag intv_p = false
end end
def default_merge_branch 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 end
case ARGV[0] case ARGV[0]