1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* tool/merger.rb: now can merge revision(s) without --ticket again.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37154 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2012-10-12 07:07:10 +00:00
parent 1b4c99c057
commit 727c8cdfe7
2 changed files with 6 additions and 0 deletions

View file

@ -1,3 +1,7 @@
Fri Oct 12 16:06:20 2012 NAKAMURA Usaku <usa@ruby-lang.org>
* tool/merger.rb: now can merge revision(s) without --ticket again.
Fri Oct 12 14:10:41 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/mkmf.rb (dir_config, init_mkmf): use configured libdir value as

View file

@ -131,6 +131,8 @@ else
if /--ticket=(.*)/ =~ ARGV[0]
tickets = $1.split(/,/).map{|num| " [Backport ##{num}]"}
ARGV.shift
else
tickets = []
end
q = $repos + (ARGV[1] || default_merge_branch)