Skip to content

Commit

Permalink
[docs] Document how to merge patches into release branches
Browse files Browse the repository at this point in the history
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@258736 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
vedantk committed Jan 25, 2016
1 parent 64d9b9e commit 56ad206
Showing 1 changed file with 17 additions and 0 deletions.
17 changes: 17 additions & 0 deletions docs/HowToReleaseLLVM.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
-------------------

Expand Down

0 comments on commit 56ad206

Please sign in to comment.