From 3c8784c201051a3a7cc36e31b99c63dae0e547e0 Mon Sep 17 00:00:00 2001 From: nagachika Date: Mon, 4 Mar 2013 16:22:15 +0000 Subject: merge revision(s) 39358: * tool/merger.rb: add interaction when only ChangeLog is modified. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39589 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- tool/merger.rb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'tool') diff --git a/tool/merger.rb b/tool/merger.rb index a134d84c2d..961bb20f1b 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -192,6 +192,11 @@ else 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| -- cgit v1.2.3