naruse	2012-02-08 10:04:07 +0900 (Wed, 08 Feb 2012)

  New Revision: 34470

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34470

  Log:
    * tool/merger.rb: don't abort, update first.

  Modified files:
    trunk/ChangeLog
    trunk/tool/merger.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34469)
+++ ChangeLog	(revision 34470)
@@ -1,3 +1,7 @@
+Wed Feb  8 09:49:58 2012  NARUSE, Yui  <naruse@r...>
+
+	* tool/merger.rb: don't abort, update first.
+
 Wed Feb 08 09:57:33 2012  Martin Bosslet  <Martin.Bosslet@g...>
 
 	* ext/openssl/ossl_asn1.c: Call INT2NUM only once for GeneralString.
Index: tool/merger.rb
===================================================================
--- tool/merger.rb	(revision 34469)
+++ tool/merger.rb	(revision 34470)
@@ -125,10 +125,7 @@
   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 @@
 
   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.'

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/