summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-06-16 03:20:55 (GMT)
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2019-06-16 03:20:55 (GMT)
commitaccd7f69736c5eade1631f7b092cc96c2046725f (patch)
tree031c17391b1cbf9b5bdf595546a9639422e732b5
parentf4fe2a76b0564e8e572936dec3bd724ac22b7a44 (diff)
merge revision(s) af1e487e9bb763b939dc6704c9a343c9eafa1637,6f8ac2cb28f99a4b2588c59ec44eff6ed38c4d3b: [Backport #15801]ruby_2_6
Updated marked commits for ChangeLog Include the beginning commit in ChangeLog git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67711 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--doc/ChangeLog-20165
-rw-r--r--doc/ChangeLog-20176
-rw-r--r--tool/vcs.rb2
-rw-r--r--version.h4
4 files changed, 12 insertions, 5 deletions
diff --git a/doc/ChangeLog-2016 b/doc/ChangeLog-2016
index c708428..14fcba5 100644
--- a/doc/ChangeLog-2016
+++ b/doc/ChangeLog-2016
@@ -1,5 +1,6 @@
------------------------------------------------------------------------
-r56645 | naruse | 2016-11-07 00:56:27 +0900 (Mon, 07 Nov 2016) | 1 line
+r57181 | matz | 2016-12-26 01:35:51 +0900 (Mon, 26 Dec 2016) | 2 lines
+
+version.h (RUBY_VERSION): 2.5.0 development has started.
-Obsolete ChangeLog [Feature #12283]
------------------------------------------------------------------------
diff --git a/doc/ChangeLog-2017 b/doc/ChangeLog-2017
new file mode 100644
index 0000000..82c4f7c
--- /dev/null
+++ b/doc/ChangeLog-2017
@@ -0,0 +1,6 @@
+------------------------------------------------------------------------
+r61474 | matz | 2017-12-25 23:05:59 +0900 (Mon, 25 Dec 2017) | 2 lines
+
+version.h (RUBY_VERSION): 2.6.0 development has started.
+
+------------------------------------------------------------------------
diff --git a/tool/vcs.rb b/tool/vcs.rb
index b97334e..e53d0c7 100644
--- a/tool/vcs.rb
+++ b/tool/vcs.rb
@@ -469,7 +469,7 @@ class VCS
%W"#{COMMAND} log -n1 --format=format:%H" <<
"--grep=^ *git-svn-id: .*@#{rev} ")
rev unless rev.empty?
- end.join('..')
+ end.join('^..')
cmd_pipe({'TZ' => 'JST-9', 'LANG' => 'C', 'LC_ALL' => 'C'},
%W"#{COMMAND} log --no-notes --date=iso-local --topo-order #{range}", "rb") do |r|
open(path, 'w') do |w|
diff --git a/version.h b/version.h
index 1f1bca9..b31b267 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.6.3"
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 63
+#define RUBY_PATCHLEVEL 64
#define RUBY_RELEASE_YEAR 2019
#define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 13
+#define RUBY_RELEASE_DAY 16
#include "ruby/version.h"