summaryrefslogtreecommitdiffstats
path: root/llvm/utils/release/merge.sh
Commit message (Collapse)AuthorAgeFilesLines
* Update the file headers across all of the LLVM projects in the monorepoChandler Carruth2019-01-191-4/+3
| | | | | | | | | | | | | | | | | to reflect the new license. We understand that people may be surprised that we're moving the header entirely to discuss the new license. We checked this carefully with the Foundation's lawyer and we believe this is the correct approach. Essentially, all code in the project is now made available by the LLVM project under our new license, so you will see that the license headers include that license only. Some of our contributors have contributed code under our old license, and accordingly, we have retained a copy of our old license notice in the top-level files in each project and repository. llvm-svn: 351636
* Print correct directory in merge script.Richard Trieu2016-11-111-1/+1
| | | | | | | When providing the project directory to the merge script, print it out in the commit instructions instead of the default project directory. llvm-svn: 286675
* Revert r273099 "If the revision number starts with r, drop it. It will get ↵Hans Wennborg2016-07-181-1/+1
| | | | | | | | | | | | | added back" This doesn't seem to work with Bash: $ /work/llvm/utils/release/merge.sh --proj llvm --rev r275870 /work/llvm/utils/release/merge.sh: line 34: ${$1#r}: bad substitution I get the same error with and without a leading 'r'. llvm-svn: 275898
* If the revision number starts with r, drop it. It will get added backJoerg Sonnenberger2016-06-181-1/+1
| | | | | | later and we don't want to use it twice. llvm-svn: 273099
* Update usage(), make sure srcdir is really empty.Joerg Sonnenberger2016-06-011-0/+2
| | | | llvm-svn: 271396
* Make it easier to process merges in a normal buildable directory tree byJoerg Sonnenberger2016-05-291-1/+9
| | | | | | allowing the user to specify the base directory of the checkout. llvm-svn: 271192
* Remove bashism from merge.sh: POSIX sh does not have the `function`Dimitry Andric2016-01-131-1/+1
| | | | | | | reserved word, and it is even superfluous in bash, for this particular instance. llvm-svn: 257663
* Add a -revert option to utils/release/merge.shHans Wennborg2015-08-041-4/+19
| | | | llvm-svn: 243929
* Release merge script: don't actually commit the mergeHans Wennborg2015-01-131-4/+6
| | | | | | | | Instead, just present the command for committing it. This way, the user can test the merge locally, resolve conflicts, etc. before committing, which seems much safer to me. llvm-svn: 225737
* Update the tree before applying patch.Bill Wendling2011-10-161-0/+2
| | | | llvm-svn: 142155
* Add a script that helps merge changes into a release branch.Bill Wendling2011-10-161-0/+72
llvm-svn: 142097
OpenPOWER on IntegriCloud