summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xtool/merger.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7e6d050fee8..155a27ad26f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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)
diff --git a/tool/merger.rb b/tool/merger.rb
index 6f82541e0d1..ef240274529 100755
--- a/tool/merger.rb
+++ b/tool/merger.rb
@@ -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]