From 83299c73f36a56442a24de26f049f1a21d724d5c Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 10 Sep 2017 12:35:06 +0000 Subject: 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 --- tool/merger.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tool') 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 -- cgit v1.2.3