8f9b8d48b6
* tool/merger.rb: use FileUtile.rm_f to fix an error on missing temporary file.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-04-23 18:05:26 +00:00
696adbccd3
* tool/merger.rb: remove temporary file.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-04-22 05:52:30 +00:00
a517e6f9e3
* tool/merger.rb (version): version number may be two-digit.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54459 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-31 15:04:34 +00:00
e5472649f4
* tool/merger.rb: update revision.h before merge.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54420 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-29 16:55:54 +00:00
33a8940855
* tool/merger.rb: support to backport header as backport identifier.
...
Now you can specify by 'merge revision(s) 49254: [Backport #10738 ]'.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54389 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-29 09:59:26 +00:00
825bcc36ee
merger.rb: show procedure to push tag into GitHub
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53029 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-11 02:08:41 +00:00
be801955e9
* tool/merger.rb: get user's attention by using colored message when requiring operation.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-08 03:20:07 +00:00
cdf0a92c75
* tool/merger.rb (versionup): should also increment revision when
...
changing teeny.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-04-14 07:05:30 +00:00
fe46bec769
* tool/merger.rb: Added documentation to version method.
...
[fix GH-847][ci skip] Patch by @magikid
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49876 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-07 00:18:46 +00:00
dff21f052f
remove ruby_1_9_2 support
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49827 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-03 08:55:59 +00:00
7968f885a0
add teenyup
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49826 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-03 08:55:52 +00:00
c934771ca9
* tool/merger.rb (help): hilighten.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49623 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-17 08:10:52 +00:00
abd92f0dec
* tool/merger.rb: unlink temporary file explicitly.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46167 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-27 10:34:43 +00:00
488b8befc2
X:Y doesn't include X in svn
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-27 14:31:24 +00:00
1ebf8916b2
tool/merger.rb: normalize the merged revision string
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-27 04:10:03 +00:00
71d3a294d4
* tool/merger.rb (tag): support 2.1.1 semi-automatic tagging and 2.2.0 explicit tagging.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44434 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-26 01:28:18 +00:00
de697194c2
merger.rb: runnable
...
* tool/merger.rb: make runnable.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39425 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-23 04:51:12 +00:00
0ac71e725c
merger.rb: suppress warnings
...
* tool/merger.rb (version_up, tag, default_merge_branch): suppress
syntax warnings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39424 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-23 04:49:16 +00:00
45dcceaa71
* tool/merger.rb: add interaction when only ChangeLog is modified.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39358 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-21 08:31:45 +00:00
e4d1a8a157
* tool/merger.rb: typo.
...
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37602 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-09 15:42:55 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
nagachika
usa
naruse
hsbt
nobu
knu
kosaki