RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-02-19 11:41:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

docs: Add instructions for how to submit a merge request

Browse Source 
Reviewers: hansw, hans

Reviewed By: hans

Subscribers: hans, llvm-commits

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

llvm-svn: 313608
This commit is contained in:
Tom Stellard 2017-09-19 03:23:03 +00:00
parent 1ba137b8e8
commit a73200a428
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
docs/HowToReleaseLLVM.rst
View File

@ -256,6 +256,28 @@ If a bug can't be reproduced, or stops being a blocker, it should be removed
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@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
-------------------