diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-06 12:55:56 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-06 12:55:56 +0000 |
commit | b33dc193c84598c71e088010f40267dce141fda0 (patch) | |
tree | 88f690b0b3f1b940655392405d050d31793df560 /tool | |
parent | 730d3c566c149cc22997828e5941699280958ac9 (diff) | |
download | ruby-b33dc193c84598c71e088010f40267dce141fda0.tar.gz |
* tool/merger.rb: abort if the working directory is dirty.
* tool/merger.rb: update the working directory after commit.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34449 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
-rwxr-xr-x | tool/merger.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tool/merger.rb b/tool/merger.rb index 2f9625ce90..673f7b1876 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -125,6 +125,11 @@ when nil, "-h", "--help" help exit else + unless `svn st`.empty? + puts 'this working directory is not clean' + abort + end + q = $repos + (ARGV[1] || default_merge_branch) revs = ARGV[0].split /,\s*/ log = '' @@ -199,6 +204,7 @@ 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.' |