summaryrefslogtreecommitdiff
path: root/tool
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-29 16:55:54 (GMT)
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-29 16:55:54 (GMT)
commite5472649f4f7830803235d58f1c800702246d906 (patch)
tree6a1c4223720c63fdc98a657ff4acfe107bd016f6 /tool
parent4a58f51a954529c262765bb69daa1f248a348423 (diff)
* tool/merger.rb: update revision.h before merge.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54420 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
-rwxr-xr-xtool/merger.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/tool/merger.rb b/tool/merger.rb
index 800db34..bc9e9c1 100755
--- a/tool/merger.rb
+++ b/tool/merger.rb
@@ -167,6 +167,8 @@ when nil, "-h", "--help"
exit
else
system 'svn up'
+ system 'ruby tool/file2lastrev.rb --revision.h . > revision.tmp'
+ system 'tool/ifchange "--timestamp=.revision.time" "revision.h" "revision.tmp"'
case ARGV[0]
when /--ticket=(.*)/