kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

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

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39358 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2013-02-21 08:31:45 +00:00
parent 087e888a15
commit 45dcceaa71
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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

5
tool/merger.rb
View file

@ -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|