aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rwxr-xr-xtool/redmine-backporter.rb5
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 15a315029f..9e601fc5e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Mar 30 01:54:30 2016 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * tool/redmine-backporter.rb: add given revision to current changests
+ on associating the revision to the related ticket.
+
+Wed Mar 30 01:53:17 2016 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * tool/merger.rb: update revision.h before merge.
+
Tue Mar 29 19:33:54 2016 NARUSE, Yui <naruse@ruby-lang.org>
* addr2line.c: define toupper for its use. fix r54391.
diff --git a/tool/redmine-backporter.rb b/tool/redmine-backporter.rb
index 72046e2498..aedd2d3d36 100755
--- a/tool/redmine-backporter.rb
+++ b/tool/redmine-backporter.rb
@@ -406,7 +406,7 @@ eom
"rel" => proc{|args|
# this feature requires custom redmine which allows add_related_issue API
- raise CommandSyntaxError unless /\A(\d+)\z/ =~ args
+ raise CommandSyntaxError unless /\Ar?(\d+)\z/ =~ args
unless @issue
puts "ticket not selected"
next
@@ -420,9 +420,10 @@ eom
res.value
rescue
$stderr.puts "deployed redmine doesn't have https://github.com/ruby/bugs.ruby-lang.org/commit/01fbba60d68cb916ddbccc8a8710e68c5217171d\nask naruse or hsbt"
- return
+ raise
end
puts res.body
+ @changesets << rev
class << @changesets
remove_method(:validated) rescue nil
end