naruse	2018-12-26 02:03:10 +0900 (Wed, 26 Dec 2018)

  New Revision: 66562

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

  Log:
    merge revision(s) 66553:
    
    Set typeflag [Bug #15461]

  Modified directories:
    branches/ruby_2_6/
  Modified files:
    branches/ruby_2_6/tool/make-snapshot
    branches/ruby_2_6/version.h
Index: ruby_2_6/tool/make-snapshot
===================================================================
--- ruby_2_6/tool/make-snapshot	(revision 66561)
+++ ruby_2_6/tool/make-snapshot	(revision 66562)
@@ -179,7 +179,7 @@ def tar_create(tarball, dir) https://github.com/ruby/ruby/blob/trunk/ruby_2_6/tool/make-snapshot#L179
         next
       end
       name, prefix = w.split_name(path)
-      h = header.new(name: name, prefix: prefix,
+      h = header.new(name: name, prefix: prefix, typeflag: type,
                      mode: s.mode, size: size, mtime: s.mtime,
                      uname: uname, gname: gname)
       f.write(h)
Index: ruby_2_6/version.h
===================================================================
--- ruby_2_6/version.h	(revision 66561)
+++ ruby_2_6/version.h	(revision 66562)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_6/version.h#L1
 #define RUBY_VERSION "2.6.0"
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 1
+#define RUBY_PATCHLEVEL 2
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 25
+#define RUBY_RELEASE_DAY 26
 
 #include "ruby/version.h"
 
Index: ruby_2_6
===================================================================
--- ruby_2_6	(revision 66561)
+++ ruby_2_6	(revision 66562)

Property changes on: ruby_2_6
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r66553

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