RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-22 02:33:06 +01:00
Code Issues Projects Releases Wiki Activity

[docs] Document how to merge patches into release branches

Browse Source 
llvm-svn: 258736
This commit is contained in:
Vedant Kumar 2016-01-25 22:47:54 +00:00
parent 69950e68ba
commit b5f67b4e31
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
docs/HowToReleaseLLVM.rst
View File

@ -335,6 +335,23 @@ Below are the rules regarding patching the release branch:
#. For dot releases all patches must mantain both API and ABI compatibility with
the previous major release. Only bugfixes will be accepted.
Merging Patches
^^^^^^^^^^^^^^^
The ``utils/release/merge.sh`` script can be used to merge individual revisions
into any one of the llvm projects. To merge revision ``$N`` into project
``$PROJ``, do:
#. ``svn co http://llvm.org/svn/llvm-project/$PROJ/branches/release_XX
$PROJ.src``
#. ``$PROJ.src/utils/release/merge.sh --proj $PROJ --rev $N``
#. Run regression tests.
#. ``cd $PROJ.src``. Run the ``svn commit`` command printed out by ``merge.sh``
in step 2.
Release Final Tasks
-------------------