aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xtool/merger.rb8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index bdcece2a86..1a5f1284d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Apr 14 16:03:49 2015 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * tool/merger.rb (versionup): should also increment revision when
+ changing teeny.
+
Tue Apr 14 11:24:56 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/-test-/printf/printf.c (uint_to_str): renamed to get rid of
diff --git a/tool/merger.rb b/tool/merger.rb
index 68073ea1a5..367815fef2 100755
--- a/tool/merger.rb
+++ b/tool/merger.rb
@@ -79,10 +79,10 @@ def version_up(inc=nil)
if inc == :teeny
v[2].succ!
- else # patchlevel
- if pl != "-1"
- pl.succ!
- end
+ end
+ # patchlevel
+ if pl != "-1"
+ pl.succ!
end
str = open 'version.h', 'rb' do |f| f.read end