mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* tool/merger.rb: support to backport header as backport identifier.
Now you can specify by 'merge revision(s) 49254: [Backport #10738]'. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54389 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
78f540019a
commit
33a8940855
1 changed files with 8 additions and 4 deletions
|
@ -168,11 +168,15 @@ when nil, "-h", "--help"
|
|||
else
|
||||
system 'svn up'
|
||||
|
||||
if /--ticket=(.*)/ =~ ARGV[0]
|
||||
tickets = $1.split(/,/).map{|num| " [Backport ##{num}]"}
|
||||
case ARGV[0]
|
||||
when /--ticket=(.*)/
|
||||
tickets = $1.split(/,/).map{|num| " [Backport ##{num}]"}.join
|
||||
ARGV.shift
|
||||
when /merge revision\(s\) ([\d,\-]+):( \[.*)/
|
||||
tickets = $2
|
||||
ARGV[0] = $1
|
||||
else
|
||||
tickets = []
|
||||
tickets = ''
|
||||
end
|
||||
|
||||
q = $repos + (ARGV[1] || default_merge_branch)
|
||||
|
@ -237,7 +241,7 @@ else
|
|||
|
||||
version_up
|
||||
f = Tempfile.new 'merger.rb'
|
||||
f.printf "merge revision(s) %s:%s\n", revstr, tickets.join
|
||||
f.printf "merge revision(s) %s:%s\n", revstr, tickets
|
||||
f.write log_svn
|
||||
f.flush
|
||||
f.close
|
||||
|
|
Loading…
Reference in a new issue