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

* tool/merger.rb: remove borders from the commit message which is used

Browse Source 
when the commit doesn't change ChangeLog.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-02-17 03:37:44 +00:00
parent 68262a2048
commit 3b243514ff
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Feb 17 12:35:55 2012 NARUSE, Yui <naruse@ruby-lang.org>
* tool/merger.rb: remove borders from the commit message which is used
when the commit doesn't change ChangeLog.
Fri Feb 17 11:50:11 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Feb 17 11:50:11 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (btest, btest-ruby, test-sample test-knownbugs) * common.mk (btest, btest-ruby, test-sample test-knownbugs)

2
tool/merger.rb
View File

@ -153,7 +153,7 @@ else
if log_svn.empty? if log_svn.empty?
log_svn = IO.popen %w'svn log ' + r + [q] do |f| log_svn = IO.popen %w'svn log ' + r + [q] do |f|
f.read f.read
end end.sub(/\A-+\nr.*\n/, '').sub(/\n-+\n\z/, '').gsub(/^(?=\S)/, "\t")
end end
a = %w'svn merge --accept=postpone' + r + [q] a = %w'svn merge --accept=postpone' + r + [q]