From 8ac52a95d577d00ed7b783fde8bca5b2b76cb404 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 24 Sep 2012 02:23:48 +0000
Subject: [PATCH] * tool/merger.rb: add --ticket option to add ticket number.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37023 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog      | 4 ++++
 tool/merger.rb | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index e61c826103..ef8e1b60a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Sep 24 11:22:36 2012  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* tool/merger.rb: add --ticket option to add ticket number.
+
 Sun Sep 23 21:51:59 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (String#unspace): unescape with backslashes.  normal
diff --git a/tool/merger.rb b/tool/merger.rb
index 9b19019f58..b7ceb86df3 100755
--- a/tool/merger.rb
+++ b/tool/merger.rb
@@ -128,6 +128,11 @@ when nil, "-h", "--help"
 else
   system 'svn up'
 
+  if /--ticket=(.*)/ =~ ARGV[0]
+    tickets = $1.split(/,/).map{|num| " [Backport ##{num}]"}
+    ARGV.shift
+  end
+
   q = $repos + (ARGV[1] || default_merge_branch)
   revs = ARGV[0].split /,\s*/
   log = ''
@@ -178,7 +183,7 @@ else
 
   version_up
   f = Tempfile.new 'merger.rb'
-  f.printf "merge revision(s) %s:\n", ARGV[0]
+  f.printf "merge revision(s) %s:%s\n", ARGV[0], tickets.join
   f.write log_svn
   f.flush
   f.close