diff options
| author | Takashi Kokubun <takashikkbn@gmail.com> | 2019-04-28 22:14:55 +0900 |
|---|---|---|
| committer | Takashi Kokubun <takashikkbn@gmail.com> | 2019-04-28 22:15:01 +0900 |
| commit | 392d84b4900eb954fdfcf11c2a63dd4c029996f4 (patch) | |
| tree | 005e74d4fe74b3a065b95990a08fe97e3077464f | |
| parent | 1c8cefca310d12cf4ae475eeacec73bf1f5ae7c3 (diff) | |
Fix wrong svn options
for SVN as a backport source.
This was a mistake in de5378233b2ff5434f024ac66285e699794a321d...
| -rwxr-xr-x | tool/merger.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tool/merger.rb b/tool/merger.rb index 738a473f38..625e9581de 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -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 |