From: Tom Stellard Date: Tue, 19 Sep 2017 03:23:03 +0000 (+0000) Subject: docs: Add instructions for how to submit a merge request X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c482e16a32e37d1cf7ae56fe7df7038054958ffe;p=llvm 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 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@313608 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/docs/HowToReleaseLLVM.rst b/docs/HowToReleaseLLVM.rst index 5ea6d49cf48..fdc48cb4ad4 100644 --- a/docs/HowToReleaseLLVM.rst +++ b/docs/HowToReleaseLLVM.rst @@ -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 -------------------