[PATCH] D37936: docs: Add instructions for how to submit a merge request

[Tom Stellard via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL313608: docs: Add instructions for how to submit a merge request (authored by tstellar).

Changed prior to commit:
  https://reviews.llvm.org/D37936?vs=115530&id=115784#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D37936

Files:
  llvm/trunk/docs/HowToReleaseLLVM.rst


Index: llvm/trunk/docs/HowToReleaseLLVM.rst
===================================================================
--- llvm/trunk/docs/HowToReleaseLLVM.rst
+++ llvm/trunk/docs/HowToReleaseLLVM.rst
@@ -256,6 +256,28 @@
 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
 -------------------
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D37936.115784.patch
Type: text/x-patch
Size: 1326 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170919/6618e759/attachment.bin>