[前][次][番号順一覧][スレッド一覧]

ruby-changes:56674

From: nagachika <ko1@a...>
Date: Sat, 27 Jul 2019 20:16:30 +0900 (JST)
Subject: [ruby-changes:56674] nagachika: 73530a9619 (master): tool/merger.rb: execute 'svn update' after 'svn ci' to update revision info on working copy.

https://git.ruby-lang.org/ruby.git/commit/?id=73530a9619

From 73530a961918c4039a4c44865a89742b7b693a0b Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Sat, 27 Jul 2019 20:15:53 +0900
Subject: tool/merger.rb: execute 'svn update' after 'svn ci' to update
 revision info on working copy.


diff --git a/tool/merger.rb b/tool/merger.rb
index f5ed985..7405948 100755
--- a/tool/merger.rb
+++ b/tool/merger.rb
@@ -207,6 +207,7 @@ class << Merger https://github.com/ruby/ruby/blob/trunk/tool/merger.rb#L207
     if svn_mode?
       begin
         execute('svn', 'ci', '-F', file)
+        execute('svn', 'update') # svn ci doesn't update revision info on working copy
       ensure
         execute('rm', '-f', 'subversion.commitlog')
       end
-- 
cgit v0.10.2


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

[前][次][番号順一覧][スレッド一覧]