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

merge revision(s) 34568:

Browse source 
* 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/branches/ruby_1_9_3@34569 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2012-02-12 07:35:32 +00:00
parent 7d86051f25
commit f4df871a4f
3 changed files with 8 additions and 2 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:34:55 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 09:38:46 2012 Yukihiro Matsumoto <matz@ruby-lang.org> Sun Feb 12 09:38:46 2012 Yukihiro Matsumoto <matz@ruby-lang.org>
* vm_method.c (rb_add_method): should not call method_added hook * vm_method.c (rb_add_method): should not call method_added hook

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]

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3" #define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 97 #define RUBY_PATCHLEVEL 98
#define RUBY_RELEASE_DATE "2012-02-12" #define RUBY_RELEASE_DATE "2012-02-12"
#define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_YEAR 2012