tool/merger.rb: execute 'svn update' after 'svn ci' to update revision info on working copy.
This commit is contained in:
parent
7b727e30fc
commit
73530a9619
@ -207,6 +207,7 @@ class << Merger
|
|||||||
if svn_mode?
|
if svn_mode?
|
||||||
begin
|
begin
|
||||||
execute('svn', 'ci', '-F', file)
|
execute('svn', 'ci', '-F', file)
|
||||||
|
execute('svn', 'update') # svn ci doesn't update revision info on working copy
|
||||||
ensure
|
ensure
|
||||||
execute('rm', '-f', 'subversion.commitlog')
|
execute('rm', '-f', 'subversion.commitlog')
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user