aboutsummaryrefslogtreecommitdiffstats
path: root/tool/merger.rb
diff options
context:
space:
mode:
Diffstat (limited to 'tool/merger.rb')
-rwxr-xr-xtool/merger.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/tool/merger.rb b/tool/merger.rb
index 673f7b1876..d8ae16016b 100755
--- a/tool/merger.rb
+++ b/tool/merger.rb
@@ -125,10 +125,7 @@ when nil, "-h", "--help"
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 @@ else
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.'