iSharkFly-Open
/
python-peps
mirror of https://github.com/python/peps.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make it clearer that when branching for a final major release, the 

branch tag should be releaseXY-maint.
This commit is contained in:
Barry Warsaw 2003-07-31 14:21:07 +00:00
parent 11a40fd88b
commit fb5b957ad5
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pep-0101.txt
View File

@ -39,8 +39,11 @@ How to Make A Release
We use the following conventions in the examples below. Where a
release number is given, it is of the form X.YaZ, e.g. 2.1a3 for
Python 2.1 alpha 3, where "a" == alpha, "b" == beta, "rc" ==
release candidate. Final releases are named "releaseXY" so the
branch tag is "releaseXY-branch" and the fork tag on the trunk is
release candidate.
Final releases are named "releaseXY". The branch tag is
"releaseXY-maint" because this will point to the long lived
maintenance branch. The fork tag on the trunk is
"releaseXY-fork". If a micro release number is used, then we'll
say X.Y.MaZ.
@ -114,20 +117,20 @@ How to Make A Release
___ cvs tag rXYaZ
To create a branch the following steps are taken:
To create a maintenance branch the following steps are taken:
___ CVS tag the trunk with the symbolic name "releaseXY-fork", e.g.
% cvs tag releaseXY-fork
___ Make the branch with the symbolic name "releaseXY-branch", e.g.
% cvs tag -b releaseXY-branch
___ Make the branch with the symbolic name "releaseXY-maint", e.g.
% cvs tag -b releaseXY-maint
___ Check out a clean version of the branch into a new directory.
You'll be doing a lot of work in this directory and you want
to keep it straight from your trunk working directory. E.g.
% export CVSROOT=cvs.sf.net:/cvsroot/python
% cvs -q co -d python-22a3 -r release23-branch python/dist/src
% cvs -q co -d python-22a3 -r release23-maint python/dist/src
___ cd into the branch directory.
@ -448,7 +451,7 @@ How to Make A Release
command was messed up, so try again.
___ cd to python-clean and do a "cvs commit". Use as your log
message something like "Merging the rXYaZ-branch tag back into
message something like "Merging the rXYaZ-maint tag back into
the trunk".
___ Edit the file Include/patchlevel.h so that the PY_VERSION