From b60a01db6a18e8e196f5277b0f9bf8684377471e Mon Sep 17 00:00:00 2001
From: kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 3 Jan 2012 02:39:15 +0000
Subject: * tool/merger.rb (#version_up): version.h date should be Japanese  
 locale date.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34190 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog      | 5 +++++
 tool/merger.rb | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 62bb9d0d61..ca8f3e53ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan  3 11:17:55 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* tool/merger.rb (#version_up): version.h date should be Japanese
+	  locale date.
+
 Mon Jan  2 22:08:00 2012  Akinori MUSHA  <knu@iDaemons.org>
 
 	* tool/file2lastrev.rb (VCS::detect): Add support for Subversion
diff --git a/tool/merger.rb b/tool/merger.rb
index 48fddc38f2..a521b0ea16 100755
--- a/tool/merger.rb
+++ b/tool/merger.rb
@@ -58,7 +58,8 @@ def interactive str
 end
 
 def version_up
-  d = Date.today
+  d = DateTime.now
+  d = d.new_offset(Rational(9,24)) # we need server locale (i.e. japanese) time
   system *%w'svn revert version.h'
   v, p = version
 
-- 
cgit v1.2.3