diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-08 01:04:07 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-08 01:04:07 +0000 |
commit | 1a991ffebcd51ffd0df80a82c2b5fe4c65f2d2c0 (patch) | |
tree | 902b1efa51a69a2bf2d292a18e6ada80c61043e5 /tool | |
parent | 460c8907c99e2b90a5fb0cb6c18f2537fd4e60e1 (diff) | |
download | ruby-1a991ffebcd51ffd0df80a82c2b5fe4c65f2d2c0.tar.gz |
* tool/merger.rb: don't abort, update first.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34470 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
-rwxr-xr-x | tool/merger.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tool/merger.rb b/tool/merger.rb index 673f7b1876..d8ae16016b 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -125,10 +125,7 @@ when nil, "-h", "--help" help exit else - unless `svn st`.empty? - puts 'this working directory is not clean' - abort - end + system 'svn up' q = $repos + (ARGV[1] || default_merge_branch) revs = ARGV[0].split /,\s*/ @@ -204,7 +201,6 @@ else if system *%w'svn ci -F' + [f.path] # tag :interactive # no longer needed. - system 'svn up' system 'rm -f subversion.commitlog' else puts 'commit failed; try again.' |