[Python-checkins] python/nondist/peps pep-0101.txt,1.35,1.36

[bwarsaw@users.sourceforge.net]

Update of /cvsroot/python/python/nondist/peps
In directory sc8-pr-cvs1:/tmp/cvs-serv25586

Modified Files:
	pep-0101.txt 
Log Message:
Make it clearer that when branching for a final major release, the
branch tag should be releaseXY-maint.


Index: pep-0101.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0101.txt,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** pep-0101.txt	30 Jul 2003 00:09:36 -0000	1.35
--- pep-0101.txt	31 Jul 2003 14:21:07 -0000	1.36
***************
*** 40,45 ****
      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
      "releaseXY-fork".  If a micro release number is used, then we'll
      say X.Y.MaZ.
--- 40,48 ----
      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".  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.
***************
*** 115,125 ****
      ___ cvs tag rXYaZ
  
!       To create a 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
  
      ___ Check out a clean version of the branch into a new directory.
--- 118,128 ----
      ___ cvs tag rXYaZ
  
!       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-maint", e.g.
!         % cvs tag -b releaseXY-maint
  
      ___ Check out a clean version of the branch into a new directory.
***************
*** 128,132 ****
  
          % export CVSROOT=cvs.sf.net:/cvsroot/python
!         % cvs -q co -d python-22a3 -r release23-branch python/dist/src
  
      ___ cd into the branch directory.
--- 131,135 ----
  
          % export CVSROOT=cvs.sf.net:/cvsroot/python
!         % cvs -q co -d python-22a3 -r release23-maint python/dist/src
  
      ___ cd into the branch directory.
***************
*** 449,453 ****
  
      ___ cd to python-clean and do a "cvs commit".  Use as your log
!         message something like "Merging the rXYaZ-branch tag back into
          the trunk".
  
--- 452,456 ----
  
      ___ cd to python-clean and do a "cvs commit".  Use as your log
!         message something like "Merging the rXYaZ-maint tag back into
          the trunk".