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: don't abort, update first.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34470 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-02-08 01:04:07 +00:00
parent 460c8907c9
commit 1a991ffebc
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Wed Feb 8 09:49:58 2012 NARUSE, Yui <naruse@ruby-lang.org>
* tool/merger.rb: don't abort, update first.
Wed Feb 08 09:57:33 2012 Martin Bosslet <Martin.Bosslet@googlemail.com>
* ext/openssl/ossl_asn1.c: Call INT2NUM only once for GeneralString.

6
tool/merger.rb
View file

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