* 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
lann · Feb 8, 2012 · 1a991ff · 1a991ff
1 parent 460c890
commit 1a991ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Feb  8 09:49:58 2012  NARUSE, Yui  <[email protected]>
+
+	* tool/merger.rb: don't abort, update first.
+
 Wed Feb 08 09:57:33 2012  Martin Bosslet  <[email protected]>
 
 	* ext/openssl/ossl_asn1.c: Call INT2NUM only once for GeneralString.

diff --git a/tool/merger.rb b/tool/merger.rb
@@ -125,10 +125,7 @@ def default_merge_branch
   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 @@ def default_merge_branch
 
   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.'