From 1a991ffebcd51ffd0df80a82c2b5fe4c65f2d2c0 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
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
---
 tool/merger.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'tool')

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