diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | tool/merger.rb | 5 |
2 files changed, 9 insertions, 0 deletions
@@ -1,3 +1,7 @@ +Thu Feb 21 17:28:14 2013 NARUSE, Yui <naruse@ruby-lang.org> + + * tool/merger.rb: add interaction when only ChangeLog is modified. + Thu Feb 21 16:34:46 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * 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| |