nagachika	2013-06-19 02:05:02 +0900 (Wed, 19 Jun 2013)

  New Revision: 41391

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=41391

  Log:
    merge revision(s) 41370:
    
    Message is 3rd argument, not 2nd

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/test/ruby/test_lazy_enumerator.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 41390)
+++ ruby_2_0_0/version.h	(revision 41391)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
-#define RUBY_RELEASE_DATE "2013-06-18"
-#define RUBY_PATCHLEVEL 228
+#define RUBY_RELEASE_DATE "2013-06-19"
+#define RUBY_PATCHLEVEL 229
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 18
+#define RUBY_RELEASE_DAY 19
 
 #include "ruby/version.h"
 
Index: ruby_2_0_0/test/ruby/test_lazy_enumerator.rb
===================================================================
--- ruby_2_0_0/test/ruby/test_lazy_enumerator.rb	(revision 41390)
+++ ruby_2_0_0/test/ruby/test_lazy_enumerator.rb	(revision 41391)
@@ -438,8 +438,8 @@ EOS https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/ruby/test_lazy_enumerator.rb#L438
 
   def test_map_zip
     bug7507 = '[ruby-core:50545]'
-    assert_ruby_status(["-e", "GC.stress = true", "-e", "(1..10).lazy.map{}.zip(){}"], bug7507)
-    assert_ruby_status(["-e", "GC.stress = true", "-e", "(1..10).lazy.map{}.zip().to_a"], bug7507)
+    assert_ruby_status(["-e", "GC.stress = true", "-e", "(1..10).lazy.map{}.zip(){}"], "", bug7507)
+    assert_ruby_status(["-e", "GC.stress = true", "-e", "(1..10).lazy.map{}.zip().to_a"], "", bug7507)
   end
 
   def test_require_block

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r41370


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/