summaryrefslogtreecommitdiff
path: root/tool/merger.rb
AgeCommit message (Collapse)Author
2018-10-18remove message already unnecesaryusa
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65140 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-12-16aliasesusa
* tool/merger.rb: aliases for removetag command. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61294 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-12-15add `removetag` commandusa
* tool/merger.rb (remove_tag): add `removetag` command. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61269 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-12-15check the existence of specified tagusa
* tool/merger.rb (tag): check the existence of specified tag before tagging to get rid of careless mistakes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-09-10merger.rb: separate logsnobu
* 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
2017-03-11Generate log from svn lognaruse
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
2016-07-02tool: add descriptions and fix typosnormal
* 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
2016-04-23* tool/merger.rb: use FileUtile.rm_f to fix an error on missing temporary file.nagachika
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54734 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-04-22* tool/merger.rb: remove temporary file.usa
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54677 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-31* tool/merger.rb (version): version number may be two-digit.usa
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54459 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-29* tool/merger.rb: update revision.h before merge.naruse
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54420 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2016-03-29* tool/merger.rb: support to backport header as backport identifier.naruse
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
2015-12-11merger.rb: show procedure to push tag into GitHubnaruse
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53029 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-12-08* tool/merger.rb: get user's attention by using colored message when ↵usa
requiring operation. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-04-14* tool/merger.rb (versionup): should also increment revision whenusa
changing teeny. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-07* tool/merger.rb: Added documentation to version method.hsbt
[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-03remove ruby_1_9_2 supportnaruse
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49827 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-03-03add teenyupnaruse
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49826 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-02-17* tool/merger.rb (help): hilighten.usa
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49623 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-05-27* tool/merger.rb: unlink temporary file explicitly.usa
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46167 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-27X:Y doesn't include X in svnnaruse
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45199 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-02-27tool/merger.rb: normalize the merged revision stringnaruse
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-26* tool/merger.rb (tag): support 2.1.1 semi-automatic tagging and 2.2.0 ↵usa
explicit tagging. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44434 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-23merger.rb: runnablenobu
* tool/merger.rb: make runnable. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39425 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-02-23merger.rb: suppress warningsnobu
* 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-21* tool/merger.rb: add interaction when only ChangeLog is modified.naruse
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39358 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-09* tool/merger.rb: typo.usa
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37602 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-01* tool/merger.rb: add feature to tag preview/rc.naruse
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37412 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-10-12* tool/merger.rb: now can merge revision(s) without --ticket again.usa
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37154 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-09-24* tool/merger.rb: add --ticket option to add ticket number.naruse
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37023 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-03-26* tool/merger.rb (interactive): allow editing commit message.nobu
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35133 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-03-26* tool/merger.rb (default_merge_branch): use IO.popen to invoke pager.nobu
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35132 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-17* tool/merger.rb: remove borders from the commit message which is usednaruse
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-12* tool/merger.rb (#default_merge_branch): Add support forknu
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-08* tool/merger.rb: don't abort, update first.naruse
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34470 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-02-06* tool/merger.rb: abort if the working directory is dirty.naruse
* 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-01-03* tool/merger.rb: allow r0123 style revision number.kosaki
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34194 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-01-03* tool/merger.rb (#version_up): version.h date should be Japanesekosaki
locale date. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34190 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-08-19Forgot content of r29049.naruse
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29050 b2dd03c8-39d4-4d8f-98ff-823fe69b080e