naruse	2016-03-29 18:59:26 +0900 (Tue, 29 Mar 2016)

  New Revision: 54389

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54389

  Log:
    * tool/merger.rb: support to backport header as backport identifier.
      Now you can specify by 'merge revision(s) 49254: [Backport #10738]'.

  Modified files:
    trunk/tool/merger.rb
Index: tool/merger.rb
===================================================================
--- tool/merger.rb	(revision 54388)
+++ tool/merger.rb	(revision 54389)
@@ -168,11 +168,15 @@ when nil, "-h", "--help" https://github.com/ruby/ruby/blob/trunk/tool/merger.rb#L168
 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 https://github.com/ruby/ruby/blob/trunk/tool/merger.rb#L241
 
   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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/