From f4df871a4f0d9af8f54870487b3624661aaaef26 Mon Sep 17 00:00:00 2001 From: knu Date: Sun, 12 Feb 2012 07:35:32 +0000 Subject: merge revision(s) 34568: * tool/merger.rb (#default_merge_branch): Add support for Subversion 1.7 which adopted a whole new working directory structure. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34569 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- tool/merger.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tool') diff --git a/tool/merger.rb b/tool/merger.rb index a521b0ea16..37aa469909 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -112,7 +112,7 @@ def tag intv_p = false 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] -- cgit v1.2.3