1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Commit graph

12 commits

Author SHA1 Message Date
naruse
082e1344cc * tool/merger.rb: add feature to tag preview/rc.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37412 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-01 19:24:21 +00:00
usa
727c8cdfe7 * tool/merger.rb: now can merge revision(s) without --ticket again.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37154 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-12 07:07:10 +00:00
naruse
8ac52a95d5 * tool/merger.rb: add --ticket option to add ticket number.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37023 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-09-24 02:23:48 +00:00
nobu
06fba52338 * tool/merger.rb (interactive): allow editing commit message.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35133 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-03-26 03:57:07 +00:00
nobu
1b2a60759b * tool/merger.rb (default_merge_branch): use IO.popen to invoke pager.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35132 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-03-26 03:57:03 +00:00
naruse
3b243514ff * tool/merger.rb: remove borders from the commit message which is used
when the commit doesn't change ChangeLog.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-17 03:37:44 +00:00
knu
24dbd19791 * tool/merger.rb (#default_merge_branch): Add support for
Subversion 1.7 which adopted a whole new working directory
  structure.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-12 07:33:09 +00:00
naruse
1a991ffebc * tool/merger.rb: don't abort, update first.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34470 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-08 01:04:07 +00:00
naruse
b33dc193c8 * tool/merger.rb: abort if the working directory is dirty.
* tool/merger.rb: update the working directory after commit.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34449 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-06 12:55:56 +00:00
kosaki
c38dec6d3b * tool/merger.rb: allow r0123 style revision number.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34194 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-03 04:45:08 +00:00
kosaki
b60a01db6a * tool/merger.rb (#version_up): version.h date should be Japanese
locale date.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34190 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-03 02:39:15 +00:00
naruse
3c9efc1d2d Forgot content of r29049.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29050 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-08-19 10:16:35 +00:00