naruse	2017-03-24 23:06:24 +0900 (Fri, 24 Mar 2017)

  New Revision: 58079

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=58079

  Log:
    merge revision(s) 58078:
    
    export_changelog must specify the branch's url

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/tool/make-snapshot
    branches/ruby_2_4/tool/vcs.rb
    branches/ruby_2_4/version.h
Index: ruby_2_4/tool/make-snapshot
===================================================================
--- ruby_2_4/tool/make-snapshot	(revision 58078)
+++ ruby_2_4/tool/make-snapshot	(revision 58079)
@@ -225,7 +225,7 @@ def package(vcs, rev, destdir, tmp = nil https://github.com/ruby/ruby/blob/trunk/ruby_2_4/tool/make-snapshot#L225
     unless /\Ar(\d+) / =~ f.readline
       abort "#{File.basename $0}: Cannot find revision from '#{last_ChangeLog}'"
     end
-    vcs.export_changelog($1.to_i, revision.to_i, "#{v}/ChangeLog")
+    vcs.export_changelog(url, $1.to_i, revision.to_i, "#{v}/ChangeLog")
   end
 
   open("#{v}/revision.h", "wb") {|f| f.puts "#define RUBY_REVISION #{revision}"}
Index: ruby_2_4/tool/vcs.rb
===================================================================
--- ruby_2_4/tool/vcs.rb	(revision 58078)
+++ ruby_2_4/tool/vcs.rb	(revision 58079)
@@ -307,7 +307,7 @@ class VCS https://github.com/ruby/ruby/blob/trunk/ruby_2_4/tool/vcs.rb#L307
       FileUtils.rm_rf(dir+"/.svn")
     end
 
-    def export_changelog(from, to, path)
+    def export_changelog(url, from, to, path)
       range = [to, (from+1 if from)].compact.join(':')
       IO.popen({'TZ' => 'JST-9', 'LANG' => 'C', 'LC_ALL' => 'C'},
                %W"svn log -r#{range} #{url}") do |r|
@@ -424,7 +424,7 @@ class VCS https://github.com/ruby/ruby/blob/trunk/ruby_2_4/tool/vcs.rb#L424
       FileUtils.rm_rf("#{dir}/.git")
     end
 
-    def export_changelog(from, to, path)
+    def export_changelog(url, from, to, path)
       range = [from, to].map do |rev|
         rev or next
         rev = cmd_read({'LANG' => 'C', 'LC_ALL' => 'C'},
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 58078)
+++ ruby_2_4/version.h	(revision 58079)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.1"
-#define RUBY_RELEASE_DATE "2017-03-22"
-#define RUBY_PATCHLEVEL 111
+#define RUBY_RELEASE_DATE "2017-03-24"
+#define RUBY_PATCHLEVEL 112
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_DAY 24
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r58078


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