kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Fix wrong svn options

Browse source 
for SVN as a backport source.

This was a mistake in de5378233b2ff5434f024ac66285e699794a321d...
This commit is contained in:
Takashi Kokubun 2019-04-28 22:14:55 +09:00
parent 1c8cefca31
commit 392d84b490
No known key found for this signature in database
GPG key ID: 6FFC433B12EE23DD
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tool/merger.rb
View file

@ -266,9 +266,9 @@ else
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