aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-22 05:52:30 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-22 05:52:30 +0000
commit280a2a8763a05ef3de33a545178606f8c52c942f (patch)
tree290c6ea700370e7e663ec6a6681fdf17c8caeb69
parentc66d411bd8956661bf1f5edf42f4df68a1727b24 (diff)
downloadruby-280a2a8763a05ef3de33a545178606f8c52c942f.tar.gz
* tool/merger.rb: remove temporary file.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rwxr-xr-xtool/merger.rb2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 78812fbc1c..5c1cee9824 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Apr 22 14:52:04 2016 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * tool/merger.rb: remove temporary file.
+
Fri Apr 22 11:27:03 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* lib/net/http.rb: Improve documentation for SSL requests via GET method.
diff --git a/tool/merger.rb b/tool/merger.rb
index c7d8e0f0ad..07ac6e6304 100755
--- a/tool/merger.rb
+++ b/tool/merger.rb
@@ -5,6 +5,7 @@ exec "${RUBY-ruby}" "-x" "$0" "$@" && [ ] if false
# This needs ruby 1.9 and subversion.
# run this in a repository to commit.
+require 'fileutils'
require 'tempfile'
$repos = 'svn+ssh://svn@ci.ruby-lang.org/ruby/'
@@ -169,6 +170,7 @@ else
system 'svn up'
system 'ruby tool/file2lastrev.rb --revision.h . > revision.tmp'
system 'tool/ifchange "--timestamp=.revision.time" "revision.h" "revision.tmp"'
+ FileUtils.rm('revision.tmp')
case ARGV[0]
when /--ticket=(.*)/