[llvm] r258736 - [docs] Document how to merge patches into release branches

[Vedant Kumar via llvm-commits]

Author: vedantk
Date: Mon Jan 25 16:47:54 2016
New Revision: 258736

URL: http://llvm.org/viewvc/llvm-project?rev=258736&view=rev
Log:
[docs] Document how to merge patches into release branches

Modified:
    llvm/trunk/docs/HowToReleaseLLVM.rst

Modified: llvm/trunk/docs/HowToReleaseLLVM.rst
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/HowToReleaseLLVM.rst?rev=258736&r1=258735&r2=258736&view=diff
==============================================================================
--- llvm/trunk/docs/HowToReleaseLLVM.rst (original)
+++ llvm/trunk/docs/HowToReleaseLLVM.rst Mon Jan 25 16:47:54 2016
@@ -335,6 +335,23 @@ Below are the rules regarding patching t
 #. 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
 -------------------