https://git.ruby-lang.org/ruby.git/commit/?id=392d84b490

From 392d84b4900eb954fdfcf11c2a63dd4c029996f4 Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@g...>
Date: Sun, 28 Apr 2019 22:14:55 +0900
Subject: Fix wrong svn options

for SVN as a backport source.

This was a mistake in de5378233b2ff5434f024ac66285e699794a321d...

diff --git a/tool/merger.rb b/tool/merger.rb
index 738a473..625e958 100755
--- a/tool/merger.rb
+++ b/tool/merger.rb
@@ -266,9 +266,9 @@ else https://github.com/ruby/ruby/blob/trunk/tool/merger.rb#L266
     else
       default_merge_branch = (%r{^URL: .*/branches/ruby_1_8_} =~ `svn info` ? 'branches/ruby_1_8' : 'trunk')
       svn_src = "#{Merger::REPOS}#{ARGV[1] || default_merge_branch}"
-      message = IO.popen(['svn', 'log', '-r', svn_rev, svn_src], &:read)
+      message = IO.popen(['svn', 'log', '-c', svn_rev, svn_src], &:read)
 
-      cmd = ['svn', 'merge', '--accept=postpone', '-r', svn_rev, svn_src]
+      cmd = ['svn', 'merge', '--accept=postpone', '-c', svn_rev, svn_src]
       puts "+ #{cmd.join(' ')}"
       system(*cmd)
     end
-- 
cgit v0.10.2


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