summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2019-08-28 14:50:21 +0900
committernagachika <nagachika@ruby-lang.org>2019-08-28 14:50:21 +0900
commited8d2e1cfdc57bba03065e96424e4ba7df45682e (patch)
treea4ad970770c8160396c33d66811f6f439de1f200
parentc9dc569a94e568de19a39c08d69cf4ea9bd159dd (diff)
tool/merger.rb: fix tag existence check with subversion.
-rwxr-xr-xtool/merger.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/tool/merger.rb b/tool/merger.rb
index 228faeff2c..c59f9ac5a9 100755
--- a/tool/merger.rb
+++ b/tool/merger.rb
@@ -18,6 +18,8 @@ module Merger
end
class << Merger
+ include Merger
+
def help
puts <<-HELP
\e[1msimple backport\e[0m
@@ -139,7 +141,8 @@ class << Merger
end
end
tag_url = "#{REPOS}tags/#{tagname}"
- unless system('svn', 'info', tag_url, out: IO::NULL, err: IO::NULL)
+ system('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
execute('svn', 'cp', '-m', "add tag #{tagname}", branch_url, tag_url, interactive: true)