зеркало из https://github.com/github/ruby.git
Drop SVN-specific method from Merger module
to clarify it's not needed for Git support.
This commit is contained in:
Родитель
fcb1875513
Коммит
14965c5f4b
|
@ -169,10 +169,6 @@ def remove_tag intv_p = false, relname
|
||||||
system(*%w'svn rm -m', "remove tag #{tagname}", tag_url)
|
system(*%w'svn rm -m', "remove tag #{tagname}", tag_url)
|
||||||
end
|
end
|
||||||
|
|
||||||
def default_merge_branch
|
|
||||||
%r{^URL: .*/branches/ruby_1_8_} =~ `svn info` ? 'branches/ruby_1_8' : 'trunk'
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
# Prints the version of Ruby found in version.h
|
# Prints the version of Ruby found in version.h
|
||||||
|
@ -235,7 +231,6 @@ else
|
||||||
tickets = ''
|
tickets = ''
|
||||||
end
|
end
|
||||||
|
|
||||||
q = $repos + (ARGV[1] || Merger.default_merge_branch)
|
|
||||||
revstr = ARGV[0].delete('^, :\-0-9a-fA-F')
|
revstr = ARGV[0].delete('^, :\-0-9a-fA-F')
|
||||||
revs = revstr.split(/[,\s]+/)
|
revs = revstr.split(/[,\s]+/)
|
||||||
commit_message = ''
|
commit_message = ''
|
||||||
|
@ -268,9 +263,11 @@ else
|
||||||
puts "+ git apply"
|
puts "+ git apply"
|
||||||
IO.popen(['git', 'apply'], 'w') { |f| f.write(patch) }
|
IO.popen(['git', 'apply'], 'w') { |f| f.write(patch) }
|
||||||
else
|
else
|
||||||
message = IO.popen(['svn', 'log', '-r', svn_rev, q], &:read)
|
default_merge_branch = (%r{^URL: .*/branches/ruby_1_8_} =~ `svn info` ? 'branches/ruby_1_8' : 'trunk')
|
||||||
|
svn_src = "#{$repos}#{ARGV[1] || default_merge_branch}"
|
||||||
|
message = IO.popen(['svn', 'log', '-r', svn_rev, svn_src], &:read)
|
||||||
|
|
||||||
cmd = ['svn', 'merge', '--accept=postpone', '-r', svn_rev, q]
|
cmd = ['svn', 'merge', '--accept=postpone', '-r', svn_rev, svn_src]
|
||||||
puts "+ #{cmd.join(' ')}"
|
puts "+ #{cmd.join(' ')}"
|
||||||
system(*cmd)
|
system(*cmd)
|
||||||
end
|
end
|
||||||
|
|
Загрузка…
Ссылка в новой задаче