diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rwxr-xr-x | tool/merger.rb | 5 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Tue Mar 5 01:20:39 2013 NARUSE, Yui <naruse@ruby-lang.org> + + * tool/merger.rb: add interaction when only ChangeLog is modified. + Tue Mar 5 01:03:16 2013 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * file.c (rb_group_member): get rid of NGROUPS dependency. 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| @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-03-05" -#define RUBY_PATCHLEVEL 18 +#define RUBY_PATCHLEVEL 19 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 3 |