ruby-changes:24971
From: naruse <ko1@a...>
Date: Mon, 24 Sep 2012 11:23:59 +0900 (JST)
Subject: [ruby-changes:24971] naruse:r37023 (trunk): * tool/merger.rb: add --ticket option to add ticket number.
naruse 2012-09-24 11:23:48 +0900 (Mon, 24 Sep 2012) New Revision: 37023 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=37023 Log: * tool/merger.rb: add --ticket option to add ticket number. Modified files: trunk/ChangeLog trunk/tool/merger.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 37022) +++ ChangeLog (revision 37023) @@ -1,3 +1,7 @@ +Mon Sep 24 11:22:36 2012 NARUSE, Yui <naruse@r...> + + * tool/merger.rb: add --ticket option to add ticket number. + Sun Sep 23 21:51:59 2012 Nobuyoshi Nakada <nobu@r...> * lib/mkmf.rb (String#unspace): unescape with backslashes. normal Index: tool/merger.rb =================================================================== --- tool/merger.rb (revision 37022) +++ tool/merger.rb (revision 37023) @@ -128,6 +128,11 @@ 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 @@ 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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/