1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Generate log from svn log

Browse Source 
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
This commit is contained in:
naruse 2017-03-11 19:03:11 +00:00
parent f0e0823042
commit 1c96bfab98
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tool/merger.rb
View File

@ -212,13 +212,14 @@ else
end end
log << l 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? if l.empty?
log_svn = IO.popen %w'svn log ' + r + [q] do |f| l = IO.popen %w'svn log ' + r + [q] do |f|
f.read 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 end
log_svn << l
a = %w'svn merge --accept=postpone' + r + [q] a = %w'svn merge --accept=postpone' + r + [q]
STDERR.puts a.join(' ') STDERR.puts a.join(' ')