naruse	2012-02-06 21:55:56 +0900 (Mon, 06 Feb 2012)

  New Revision: 34449

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

  Log:
    * tool/merger.rb: abort if the working directory is dirty.
    
    * tool/merger.rb: update the working directory after commit.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34448)
+++ ChangeLog	(revision 34449)
@@ -1,3 +1,9 @@
+Mon Feb  6 21:55:13 2012  NARUSE, Yui  <naruse@r...>
+
+	* tool/merger.rb: abort if the working directory is dirty.
+
+	* tool/merger.rb: update the working directory after commit.
+
 Mon Feb  6 00:16:27 2012  NARUSE, Yui  <naruse@r...>
 
 	* encoding.c (rb_enc_compatible): return ASCII-8BIT even if 2nd string
Index: tool/merger.rb
===================================================================
--- tool/merger.rb	(revision 34448)
+++ tool/merger.rb	(revision 34449)
@@ -125,6 +125,11 @@
   help
   exit
 else
+  unless `svn st`.empty?
+    puts 'this working directory is not clean'
+    abort
+  end
+
   q = $repos + (ARGV[1] || default_merge_branch)
   revs = ARGV[0].split /,\s*/
   log = ''
@@ -199,6 +204,7 @@
 
   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/