aboutsummaryrefslogtreecommitdiffstats
path: root/tool/merger.rb
Commit message (Collapse)AuthorAgeFilesLines
* merger.rb: separate logsnobu2017-09-101-2/+2
| | | | | | * tool/merger.rb: separate each commit logs by an empty line. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59824 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Generate log from svn lognaruse2017-03-111-4/+5
| | | | | | When there's multiple revisions, all svn logs should be used. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57883 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* tool: add descriptions and fix typosnormal2016-07-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tool/asm_parse.rb: add description * tool/change_maker.rb: ditto * tool/downloader.rb: ditto * tool/eval.rb: ditto * tool/expand-config.rb: ditto * tool/extlibs.rb: ditto * tool/fake.rb: ditto * tool/file2lastrev.rb: ditto * tool/gem-unpack.rb: ditto * tool/gen_dummy_probes.rb: ditto * tool/gen_ruby_tapset.rb: ditto * tool/generic_erb.rb: ditto * tool/id2token.rb: ditto * tool/ifchange: ditto * tool/insns2vm.rb: ditto * tool/instruction.rb: ditto * tool/jisx0208.rb: ditto * tool/merger.rb: ditto * tool/mkrunnable.rb: ditto * tool/node_name.rb: ditto * tool/parse.rb: ditto * tool/rbinstall.rb: ditto * tool/rbuninstall.rb: ditto * tool/rmdirs: ditto * tool/runruby.rb: ditto * tool/strip-rdoc.rb: ditto * tool/vcs.rb: ditto * tool/vtlh.rb: ditto * tool/ytab.sed: ditto * tool/enc-unicode.rb: fix typo * tool/mk_call_iseq_optimized.rb: ditto * tool/update-deps: ditto [ruby-core:76215] [Bug #12539] by Noah Gibbs <the.codefolio.guy@gmail.com> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55564 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb: use FileUtile.rm_f to fix an error on missing temporary file.nagachika2016-04-231-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb: remove temporary file.usa2016-04-221-0/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb (version): version number may be two-digit.usa2016-03-311-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54459 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb: update revision.h before merge.naruse2016-03-291-0/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54420 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb: support to backport header as backport identifier.naruse2016-03-291-4/+8
| | | | | | 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
* merger.rb: show procedure to push tag into GitHubnaruse2015-12-111-0/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53029 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb: get user's attention by using colored message when ↵usa2015-12-081-1/+1
| | | | | | requiring operation. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb (versionup): should also increment revision whenusa2015-04-141-4/+4
| | | | | | | changing teeny. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb: Added documentation to version method.hsbt2015-03-071-0/+2
| | | | | | [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
* remove ruby_1_9_2 supportnaruse2015-03-031-7/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49827 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* add teenyupnaruse2015-03-031-11/+19
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49826 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb (help): hilighten.usa2015-02-171-8/+8
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49623 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb: unlink temporary file explicitly.usa2014-05-271-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46167 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* X:Y doesn't include X in svnnaruse2014-02-271-0/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* tool/merger.rb: normalize the merged revision stringnaruse2014-02-271-4/+10
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb (tag): support 2.1.1 semi-automatic tagging and 2.2.0 ↵usa2013-12-261-11/+21
| | | | | | explicit tagging. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44434 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merger.rb: runnablenobu2013-02-231-1/+4
| | | | | | * tool/merger.rb: make runnable. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39425 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* merger.rb: suppress warningsnobu2013-02-231-9/+9
| | | | | | | * 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
* * tool/merger.rb: add interaction when only ChangeLog is modified.naruse2013-02-211-0/+5
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39358 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb: typo.usa2012-11-091-1/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37602 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb: add feature to tag preview/rc.naruse2012-11-011-9/+30
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37412 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb: now can merge revision(s) without --ticket again.usa2012-10-121-0/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37154 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb: add --ticket option to add ticket number.naruse2012-09-241-1/+6
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37023 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb (interactive): allow editing commit message.nobu2012-03-261-6/+7
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35133 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb (default_merge_branch): use IO.popen to invoke pager.nobu2012-03-261-11/+6
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35132 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb: remove borders from the commit message which is usednaruse2012-02-171-1/+1
| | | | | | when the commit doesn't change ChangeLog. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb (#default_merge_branch): Add support forknu2012-02-121-1/+1
| | | | | | | | | 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
* * tool/merger.rb: don't abort, update first.naruse2012-02-081-5/+1
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34470 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb: abort if the working directory is dirty.naruse2012-02-061-0/+6
| | | | | | * 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
* * tool/merger.rb: allow r0123 style revision number.kosaki2012-01-031-2/+2
| | | | git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34194 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* * tool/merger.rb (#version_up): version.h date should be Japanesekosaki2012-01-031-1/+2
| | | | | | | | locale date. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34190 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* Forgot content of r29049.naruse2010-08-191-0/+207
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29050 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-15 00:55:01 +0000