diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-09-10 12:35:06 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-09-10 12:35:06 +0000 |
| commit | a2194230889b14a91cc336d668cec10b7547e87d (patch) | |
| tree | db801ae6d32ff3c56c2c16af70eb5c9a94b3d2ef /tool | |
| parent | 538f7ccc8ee81589eb6defd87255eed1c4e64e83 (diff) | |
| download | ruby-a2194230889b14a91cc336d668cec10b7547e87d.tar.gz | |
merger.rb: separate logs
* tool/merger.rb: separate each commit logs by an empty line.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59824 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
| -rwxr-xr-x | tool/merger.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tool/merger.rb b/tool/merger.rb index 020f2de937..7c734a5e0a 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -217,7 +217,7 @@ else if l.empty? l = IO.popen %w'svn log ' + r + [q] do |f| f.read - end.sub(/\A-+\nr.*\n/, '').sub(/\n-+\n\z/, '').gsub(/^./, "\t\\&") + end.sub(/\A-+\nr.*/, '').sub(/\n-+\n\z/, '').gsub(/^./, "\t\\&") end log_svn << l @@ -247,7 +247,7 @@ else version_up f = Tempfile.new 'merger.rb' - f.printf "merge revision(s) %s:%s\n", revstr, tickets + f.printf "merge revision(s) %s:%s", revstr, tickets f.write log_svn f.flush f.close |