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

* tool/merger.rb: abort if the working directory is dirty.

Browse source 
* 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
This commit is contained in:
naruse 2012-02-06 12:55:56 +00:00
parent 730d3c566c
commit b33dc193c8
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Mon Feb 6 21:55:13 2012 NARUSE, Yui <naruse@ruby-lang.org>
* tool/merger.rb: abort if the working directory is dirty.
* tool/merger.rb: update the working directory after commit.
Mon Feb 6 00:16:27 2012 NARUSE, Yui <naruse@ruby-lang.org>
* encoding.c (rb_enc_compatible): return ASCII-8BIT even if 2nd string

6
tool/merger.rb
View file

@ -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.'