knu	2012-02-12 16:33:09 +0900 (Sun, 12 Feb 2012)

  New Revision: 34568

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

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

  Modified files:
    trunk/ChangeLog
    trunk/tool/merger.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34567)
+++ ChangeLog	(revision 34568)
@@ -1,3 +1,9 @@
+Sun Feb 12 16:30:23 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 15:14:41 2012  Kazuki Tsujimoto  <kazuki@c...>
 
 	* benchmark/driver.rb: suppress unused/shadowing variable warnings.
Index: tool/merger.rb
===================================================================
--- tool/merger.rb	(revision 34567)
+++ tool/merger.rb	(revision 34568)
@@ -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/