From 1a991ffebcd51ffd0df80a82c2b5fe4c65f2d2c0 Mon Sep 17 00:00:00 2001 From: naruse Date: Wed, 8 Feb 2012 01:04:07 +0000 Subject: * 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 --- ChangeLog | 4 ++++ tool/merger.rb | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 97ce436471..e907d63f9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Feb 8 09:49:58 2012 NARUSE, Yui + + * tool/merger.rb: don't abort, update first. + Wed Feb 08 09:57:33 2012 Martin Bosslet * ext/openssl/ossl_asn1.c: Call INT2NUM only once for GeneralString. 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.' -- cgit v1.2.3