diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-11 19:03:11 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-11 19:03:11 +0000 |
| commit | 996e1265d06d55e33097f0318434bbd2b9b0ad75 (patch) | |
| tree | 9f73206bd7264e3f77ca867d297f6f9573fcf52f /tool | |
| parent | 0962af8b0aec54ebb18b5732f3bd61a1072fd8fd (diff) | |
| download | ruby-996e1265d06d55e33097f0318434bbd2b9b0ad75.tar.gz | |
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
Diffstat (limited to 'tool')
| -rwxr-xr-x | tool/merger.rb | 9 |
1 files 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(' ') |