mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-23 21:59:11 +00:00
Code Issues 32 Releases Wiki Activity

Updated contributing docs for some latest practices.

Browse Source
This commit is contained in:
Tim Graham
2018-04-06 13:04:11 -04:00
parent 85d853b2d3
commit 3428be3cf9
3 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/internals/howto-release-django.txt
View File

@@ -78,8 +78,8 @@ You'll need a few things before getting started:
* If this is a security release, access to the pre-notification distribution
list.
If this is your first release, you'll need to coordinate with James and/or
Jacob to get all these things lined up.
If this is your first release, you'll need to coordinate with another releaser
to get all these things lined up.
Pre-release tasks
=================
@@ -164,14 +164,14 @@ OK, this is the fun part, where we actually push out a release!
$ git pull
#. If this is a security release, merge the appropriate patches from
``django-private``. Rebase these patches as necessary to make each one a
``django-security``. Rebase these patches as necessary to make each one a
simple commit on the release branch rather than a merge commit. To ensure
this, merge them with the ``--ff-only`` flag; for example::
$ git checkout stable/1.5.x
$ git merge --ff-only security/1.5.x
(This assumes ``security/1.5.x`` is a branch in the ``django-private`` repo
(This assumes ``security/1.5.x`` is a branch in the ``django-security`` repo
containing the necessary security patches for the next release in the 1.5
series.)