summaryrefslogtreecommitdiff
path: root/tool
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-24 02:23:48 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-24 02:23:48 +0000
commit8ac52a95d577d00ed7b783fde8bca5b2b76cb404 (patch)
tree56eef3137785d51fd58c5e41caf8d6f5ab81ad4a /tool
parenta7353f69244d00a49edfb899151e2fcd82c89c2c (diff)
* 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
Diffstat (limited to 'tool')
-rwxr-xr-xtool/merger.rb7
1 files changed, 6 insertions, 1 deletions
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