knu	2012-02-12 16:35:32 +0900 (Sun, 12 Feb 2012)

  New Revision: 34569

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

  Log:
    merge revision(s) 34568:
    
    * tool/merger.rb (#default_merge_branch): Add support for
      Subversion 1.7 which adopted a whole new working directory
      structure.

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

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34568)
+++ ruby_1_9_3/ChangeLog	(revision 34569)
@@ -1,3 +1,9 @@
+Sun Feb 12 16:34:55 2012  Akinori MUSHA  <knu@i...>
+
+	* tool/merger.rb (#default_merge_branch): Add support for
+	  Subversion 1.7 which adopted a whole new working directory
+	  structure.
+
 Sun Feb 12 09:38:46 2012  Yukihiro Matsumoto  <matz@r...>
 
 	* vm_method.c (rb_add_method): should not call method_added hook
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34568)
+++ ruby_1_9_3/version.h	(revision 34569)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 97
+#define RUBY_PATCHLEVEL 98
 
 #define RUBY_RELEASE_DATE "2012-02-12"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/tool/merger.rb
===================================================================
--- ruby_1_9_3/tool/merger.rb	(revision 34568)
+++ ruby_1_9_3/tool/merger.rb	(revision 34569)
@@ -112,7 +112,7 @@
 end
 
 def default_merge_branch
-  /branches\/ruby_1_8_/ =~ IO.binread(".svn/entries", 100) ? 'branches/ruby_1_8' : 'trunk'
+  %r{^URL: .*/branches/ruby_1_8_} =~ `svn info` ? 'branches/ruby_1_8' : 'trunk'
 end
 
 case ARGV[0]

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