From 34ef129bd25e4f54f11852f53fad5f31bec0cb09 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 27 Oct 2016 07:34:32 +0000
Subject: [PATCH] * tool/redmine-backporter.rb (rel): check the exception and
 show right   message.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56502 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                  | 5 +++++
 tool/redmine-backporter.rb | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 8b5ec0f67b..e58c9df559 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 27 16:33:47 2016  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* tool/redmine-backporter.rb (rel): check the exception and show right
+	  message.
+
 Thu Oct 27 14:57:33 2016  Kazuki Yamaguchi  <k@rhe.jp>
 
 	* ext/socket/lib/socket.rb (UDPSocket#recvfrom_nonblock): [DOC] Remove
diff --git a/tool/redmine-backporter.rb b/tool/redmine-backporter.rb
index 1ac51b0dba..a9007e1a5e 100755
--- a/tool/redmine-backporter.rb
+++ b/tool/redmine-backporter.rb
@@ -419,7 +419,11 @@ eom
       begin
         res.value
       rescue
-        $stderr.puts "deployed redmine doesn't have https://github.com/ruby/bugs.ruby-lang.org/commit/01fbba60d68cb916ddbccc8a8710e68c5217171d\nask naruse or hsbt"
+        if $!.respond_to?(:response) && $!.response.is_a?(Net::HTTPConflict)
+          $stderr.puts "the revision has already related to the ticket"
+        else
+          $stderr.puts "deployed redmine doesn't have https://github.com/ruby/bugs.ruby-lang.org/commit/01fbba60d68cb916ddbccc8a8710e68c5217171d\nask naruse or hsbt"
+        end
         next
       end
       puts res.body