summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-09-10 12:35:06 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-09-10 12:35:06 +0000
commit83299c73f36a56442a24de26f049f1a21d724d5c (patch)
treedb801ae6d32ff3c56c2c16af70eb5c9a94b3d2ef
parent73adee9d6c8919688d638623c7858aec00857d62 (diff)
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
-rwxr-xr-xtool/merger.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/tool/merger.rb b/tool/merger.rb
index 020f2de..7c734a5 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