diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2016-07-23 20:41:05 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2016-07-23 20:41:05 +0000 |
| commit | 01095a5d43bbfde13731688ddcf6048ebb8b7721 (patch) | |
| tree | 4def12e759965de927d963ac65840d663ef9d1ea /docs/HowToReleaseLLVM.rst | |
| parent | f0f4822ed4b66e3579e92a89f368f8fb860e218e (diff) | |
Diffstat (limited to 'docs/HowToReleaseLLVM.rst')
| -rw-r--r-- | docs/HowToReleaseLLVM.rst | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/docs/HowToReleaseLLVM.rst b/docs/HowToReleaseLLVM.rst index 33c547e97a889..d44ea04a9fafc 100644 --- a/docs/HowToReleaseLLVM.rst +++ b/docs/HowToReleaseLLVM.rst @@ -332,9 +332,26 @@ Below are the rules regarding patching the release branch: #. During the remaining rounds of testing, only patches that fix critical regressions may be applied. -#. For dot releases all patches must mantain both API and ABI compatibility with +#. For dot releases all patches must maintain both API and ABI compatibility with the previous major release. Only bugfixes will be accepted. +Merging Patches +^^^^^^^^^^^^^^^ + +The ``utils/release/merge.sh`` script can be used to merge individual revisions +into any one of the llvm projects. To merge revision ``$N`` into project +``$PROJ``, do: + +#. ``svn co https://llvm.org/svn/llvm-project/$PROJ/branches/release_XX + $PROJ.src`` + +#. ``$PROJ.src/utils/release/merge.sh --proj $PROJ --rev $N`` + +#. Run regression tests. + +#. ``cd $PROJ.src``. Run the ``svn commit`` command printed out by ``merge.sh`` + in step 2. + Release Final Tasks ------------------- |