From 45dcceaa71a64af9cf5209ed6989511bdd753ca1 Mon Sep 17 00:00:00 2001 From: naruse Date: Thu, 21 Feb 2013 08:31:45 +0000 Subject: * tool/merger.rb: add interaction when only ChangeLog is modified. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39358 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ tool/merger.rb | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 11188ffe21..6421e0acd4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Feb 21 17:28:14 2013 NARUSE, Yui + + * tool/merger.rb: add interaction when only ChangeLog is modified. + Thu Feb 21 16:34:46 2013 Nobuyoshi Nakada * signal.c (check_stack_overflow): extract duplicated code and get rid 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