From cdf0a92c75f44b55288fcde8771f413ec6063fb4 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 14 Apr 2015 07:05:30 +0000
Subject: * tool/merger.rb (versionup): should also increment revision when  
 changing teeny.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog      | 5 +++++
 tool/merger.rb | 8 ++++----
 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
-- 
cgit v1.2.3