summaryrefslogtreecommitdiff
path: root/tool
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-29 09:59:26 (GMT)
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-29 09:59:26 (GMT)
commit33a8940855d6f2533dbb77e83f3b1bba4b849d7c (patch)
tree6fffe3005e04a55912af574b43c4b30f14564d13 /tool
parent78f540019a394421e1875cacaf956e8c23b18cc0 (diff)
* 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
Diffstat (limited to 'tool')
-rwxr-xr-xtool/merger.rb12
1 files changed, 8 insertions, 4 deletions
diff --git a/tool/merger.rb b/tool/merger.rb
index dd7d478..800db34 100755
--- a/tool/merger.rb
+++ b/tool/merger.rb
@@ -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