naruse	2012-02-17 12:37:44 +0900 (Fri, 17 Feb 2012)

  New Revision: 34659

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34659

  Log:
    * tool/merger.rb: remove borders from the commit message which is used
      when the commit doesn't change ChangeLog.

  Modified files:
    trunk/ChangeLog
    trunk/tool/merger.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34658)
+++ ChangeLog	(revision 34659)
@@ -1,3 +1,8 @@
+Fri Feb 17 12:35:55 2012  NARUSE, Yui  <naruse@r...>
+
+	* 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@r...>
 
 	* common.mk (btest, btest-ruby, test-sample test-knownbugs)
Index: tool/merger.rb
===================================================================
--- tool/merger.rb	(revision 34658)
+++ tool/merger.rb	(revision 34659)
@@ -153,7 +153,7 @@
     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]

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/