From 33a8940855d6f2533dbb77e83f3b1bba4b849d7c Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 29 Mar 2016 09:59:26 +0000
Subject: * 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
---
 tool/merger.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'tool/merger.rb')

diff --git a/tool/merger.rb b/tool/merger.rb
index dd7d478491..800db3408e 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
-- 
cgit v1.2.3