From 1c96bfab98b454f574cec3fa5d7c50ad4a721020 Mon Sep 17 00:00:00 2001 From: naruse Date: Sat, 11 Mar 2017 19:03:11 +0000 Subject: [PATCH] Generate log from svn log When there's multiple revisions, all svn logs should be used. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57883 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- tool/merger.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tool/merger.rb b/tool/merger.rb index 2faf86634f..020f2de937 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -212,13 +212,14 @@ else end log << l - log_svn << l.lines.grep(/^\+\t/).join.gsub(/^\+/, '').gsub(/^\t\*/, "\n\t\*") + l = l.lines.grep(/^\+\t/).join.gsub(/^\+/, '').gsub(/^\t\*/, "\n\t\*") - if log_svn.empty? - log_svn = IO.popen %w'svn log ' + r + [q] do |f| + 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(/^(?=\S)/, "\t") + end.sub(/\A-+\nr.*\n/, '').sub(/\n-+\n\z/, '').gsub(/^./, "\t\\&") end + log_svn << l a = %w'svn merge --accept=postpone' + r + [q] STDERR.puts a.join(' ')