From 3b10f70220112b3cf9b8ffe3155b7c3ee19822be Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 15 Dec 2017 03:04:56 +0000 Subject: check the existence of specified tag * tool/merger.rb (tag): check the existence of specified tag before tagging to get rid of careless mistakes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- tool/merger.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tool') diff --git a/tool/merger.rb b/tool/merger.rb index 7c734a5e0a..0b85c29e86 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -142,6 +142,10 @@ def tag intv_p = false, relname=nil end tagname = 'v' + x + (v[0] < "2" || (v[0] == "2" && v[1] < "1") || /^(?:preview|rc)/ =~ pl ? '_' + pl : '') tag_url = $repos + 'tags/' + tagname + system(*%w'svn info', tag_url, out: IO::NULL, err: IO::NULL) + if $?.success? + abort "specfied tag already exists. check tag name and remove it if you want to force re-tagging" + end if intv_p interactive "OK? svn cp -m \"add tag #{tagname}\" #{branch_url} #{tag_url}" do end -- cgit v1.2.3