nagachika	2013-03-05 01:22:15 +0900 (Tue, 05 Mar 2013)

  New Revision: 39589

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39589

  Log:
    merge revision(s) 39358:
    
    * tool/merger.rb: add interaction when only ChangeLog is modified.

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/tool/merger.rb
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39588)
+++ ruby_2_0_0/ChangeLog	(revision 39589)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Tue Mar  5 01:20:39 2013  NARUSE, Yui  <naruse@r...>
+
+	* tool/merger.rb: add interaction when only ChangeLog is modified.
+
 Tue Mar  5 01:03:16 2013  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* file.c (rb_group_member): get rid of NGROUPS dependency.
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39588)
+++ ruby_2_0_0/version.h	(revision 39589)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #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
Index: ruby_2_0_0/tool/merger.rb
===================================================================
--- ruby_2_0_0/tool/merger.rb	(revision 39588)
+++ ruby_2_0_0/tool/merger.rb	(revision 39589)
@@ -192,6 +192,11 @@ else https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/tool/merger.rb#L192
     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|

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39358


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/