[llvm] r313608 - docs: Add instructions for how to submit a merge request

[Tom Stellard via llvm-commits]

Author: tstellar
Date: Mon Sep 18 20:23:03 2017
New Revision: 313608

URL: http://llvm.org/viewvc/llvm-project?rev=313608&view=rev
Log:
docs: Add instructions for how to submit a merge request

Reviewers: hansw, hans

Reviewed By: hans

Subscribers: hans, llvm-commits

Differential Revision: https://reviews.llvm.org/D37936

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=313608&r1=313607&r2=313608&view=diff
==============================================================================
--- llvm/trunk/docs/HowToReleaseLLVM.rst (original)
+++ llvm/trunk/docs/HowToReleaseLLVM.rst Mon Sep 18 20:23:03 2017
@@ -256,6 +256,28 @@ If a bug can't be reproduced, or stops b
 from the Meta and its priority decreased to *normal*. Debugging can continue,
 but on trunk.
 
+Merge Requests
+--------------
+
+You can use any of the following methods to request that a revision from trunk
+be merged into a release branch:
+
+#. Use the ``utils/release/merge-request.sh`` script which will automatically
+file a bug_ requesting that the patch be merged. e.g. To request revision
+12345 be merged into the branch for the 5.0.1 release:
+``llvm.src/utils/release/merge-request.sh -stable-version 5.0 -r 12345 -user bugzilla at example.com``
+
+#. Manually file a bug_ with the subject: "Merge r12345 into the X.Y branch",
+enter the commit(s) that you want merged in the "Fixed by Commit(s)" and mark
+it as a blocker of the current release bug.  Release bugs are given aliases
+in the form of release-x.y.z, so to mark a bug as a blocker for the 5.0.1
+release, just enter release-5.0.1 in the "Blocks" field.
+
+#. Reply to the commit email on llvm-commits for the revision to merge and cc
+the release manager.
+
+.. _bug: https://bugs.llvm.org/
+
 Release Patch Rules
 -------------------