naruse	2013-02-21 17:31:45 +0900 (Thu, 21 Feb 2013)

  New Revision: 39358

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

  Log:
    * tool/merger.rb: add interaction when only ChangeLog is modified.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 39357)
+++ ChangeLog	(revision 39358)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Feb 21 17:28:14 2013  NARUSE, Yui  <naruse@r...>
+
+	* tool/merger.rb: add interaction when only ChangeLog is modified.
+
 Thu Feb 21 16:34:46 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* signal.c (check_stack_overflow): extract duplicated code and get rid
Index: tool/merger.rb
===================================================================
--- tool/merger.rb	(revision 39357)
+++ tool/merger.rb	(revision 39358)
@@ -192,6 +192,11 @@ else https://github.com/ruby/ruby/blob/trunk/tool/merger.rb#L192
     system *%w'svn revert ChangeLog' if /^\+/ =~ l
   end
 
+  if `svn diff --diff-cmd=diff -x -upw`.empty?
+    interactive 'Only ChangeLog is modified, right?' do
+    end
+  end
+
   if /^\+/ =~ log
     system *%w'svn revert ChangeLog'
     IO.popen %w'patch -p0', 'wb' do |f|

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