mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* tool/merger.rb: remove borders from the commit message which is used
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:
parent
68262a2048
commit
3b243514ff
2 changed files with 6 additions and 1 deletions
|
@ -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>
|
||||
|
||||
* common.mk (btest, btest-ruby, test-sample test-knownbugs)
|
||||
|
|
|
@ -153,7 +153,7 @@ else
|
|||
if log_svn.empty?
|
||||
log_svn = IO.popen %w'svn log ' + r + [q] do |f|
|
||||
f.read
|
||||
end
|
||||
end.sub(/\A-+\nr.*\n/, '').sub(/\n-+\n\z/, '').gsub(/^(?=\S)/, "\t")
|
||||
end
|
||||
|
||||
a = %w'svn merge --accept=postpone' + r + [q]
|
||||
|
|
Loading…
Reference in a new issue