[Python-checkins] python/nondist/peps pep-0101.txt,1.31,1.32

bwarsaw@users.sourceforge.net bwarsaw@users.sourceforge.net
Tue, 29 Jul 2003 15:43:43 -0700


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

Modified Files:
	pep-0101.txt 
Log Message:
When we do a major release branch, the tags are "releaseXY-fork" and
"releaseXY-branch".


Index: pep-0101.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0101.txt,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** pep-0101.txt	25 Jul 2003 13:54:43 -0000	1.31
--- pep-0101.txt	29 Jul 2003 22:43:40 -0000	1.32
***************
*** 3,7 ****
  Version: $Revision$
  Last-Modified: $Date$
! Author: barry@zope.com (Barry A. Warsaw), guido@python.org (Guido van Rossum)
  Status: Active
  Type: Informational
--- 3,7 ----
  Version: $Revision$
  Last-Modified: $Date$
! Author: barry@python.org (Barry A. Warsaw), guido@python.org (Guido van Rossum)
  Status: Active
  Type: Informational
***************
*** 94,98 ****
        If you're releasing an alpha/beta/release candidate, you will
        just tag the tree.  If you are releasing a final release, you
!       will tag and create a branch.
  
        All Python development happens on the trunk.  While it's
--- 94,99 ----
        If you're releasing an alpha/beta/release candidate, you will
        just tag the tree.  If you are releasing a final release, you
!       will both tag the trunk and create the long-lived maintenance
!       branch.
  
        All Python development happens on the trunk.  While it's
***************
*** 113,121 ****
        To create a branch the following steps are taken:
  
!     ___ CVS tag the trunk with the symbolic name "rXYaZ-fork", e.g.
!         % cvs tag r22a3-fork
  
!     ___ Make the branch with the symbolic name "rXYaZ-branch", e.g.
!         % cvs tag -b r22a3-branch
  
      ___ Check out a clean version of the branch into a new directory.
--- 114,122 ----
        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.
***************
*** 124,128 ****
  
          % export CVSROOT=cvs.sf.net:/cvsroot/python
!         % cvs -q co -d python-22a3 -r r22a3-branch python/dist/src
  
      ___ cd into the branch directory.
--- 125,129 ----
  
          % export CVSROOT=cvs.sf.net:/cvsroot/python
!         % cvs -q co -d python-22a3 -r release23-branch python/dist/src
  
      ___ cd into the branch directory.