diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rwxr-xr-x | tool/merger.rb | 6 |
2 files changed, 5 insertions, 5 deletions
@@ -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. 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.' |