Skip to content
This repository has been archived by the owner on Apr 23, 2020. It is now read-only.

Commit

Permalink
docs: Fix formatting in HowToReleaseLLVM
Browse files Browse the repository at this point in the history
This is a follow up to r313608.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@313609 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
tstellar committed Sep 19, 2017
1 parent c482e16 commit 9b6e3e1
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions docs/HowToReleaseLLVM.rst
Original file line number Diff line number Diff line change
Expand Up @@ -263,18 +263,18 @@ 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``
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.
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.
the release manager.

.. _bug: https://bugs.llvm.org/

Expand Down

0 comments on commit 9b6e3e1

Please sign in to comment.