From b5f67b4e313486d06595c939b58bdb6b7245222b Mon Sep 17 00:00:00 2001
From: Vedant Kumar <vsk@apple.com>
Date: Mon, 25 Jan 2016 22:47:54 +0000
Subject: [PATCH] [docs] Document how to merge patches into release branches

llvm-svn: 258736
---
 docs/HowToReleaseLLVM.rst | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/docs/HowToReleaseLLVM.rst b/docs/HowToReleaseLLVM.rst
index 33c547e97a8..f9e5d069344 100644
--- a/docs/HowToReleaseLLVM.rst
+++ b/docs/HowToReleaseLLVM.rst
@@ -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
 -------------------