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

2003年7月29日 17:09:39 -0700

Update of /cvsroot/python/python/nondist/peps
In directory sc8-pr-cvs1:/tmp/cvs-serv11773
Modified Files:
	pep-0101.txt 
Log Message:
another update
Index: pep-0101.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0101.txt,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** pep-0101.txt	29 Jul 2003 23:31:14 -0000	1.34
--- pep-0101.txt	30 Jul 2003 00:09:36 -0000	1.35
***************
*** 402,410 ****
 Now it's time to do some cleaning up. These steps are very important!

! ___ If you made a branch, be sure to merge it into the trunk! Now
! that we've released this branch, we don't need it any more.
! We've already tagged it so we can always reproduce it. Note
! that merging branches is a bit of a black art, but here's what's
! worked for us.

 ___ Check out a completely clean, virgin working directory of the
--- 402,413 ----
 Now it's time to do some cleaning up. These steps are very important!

! ___ If you made a non-maintenance branch, be sure to merge it into
! the trunk! Now that we've released this branch, we don't need
! it any more. We've already tagged it so we can always reproduce
! it. Note that merging branches is a bit of a black art, but
! here's what's worked for us.
! 
! NOTE: If this was an X.Y major release, we will be using this as
! the maintenance branch for a long time to come.

 ___ Check out a completely clean, virgin working directory of the