[Python-checkins] CVS: python/nondist/peps pep-0101.txt,1.11,1.12

[Barry Warsaw]

Update of /cvsroot/python/python/nondist/peps
In directory usw-pr-cvs1:/tmp/cvs-serv1926

Modified Files:
	pep-0101.txt 
Log Message:
More Guido feedback


Index: pep-0101.txt
===================================================================
RCS file: /cvsroot/python/python/nondist/peps/pep-0101.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pep-0101.txt	2001/10/25 05:19:19	1.11
--- pep-0101.txt	2001/10/25 15:41:29	1.12
***************
*** 104,111 ****
        version subpart macros just above PY_VERSION, as appropriate.
  
!   ___ For the next approximately 20 hours or so, selectively merge
!       stuff from trunk into branch.  For each change you see on the
!       trunk (i.e. via the python-checkins mailing list), you need to
!       decide whether the change should also be applied to the branch.
  
        Note that committers of changes to the trunk SHOULD include in
--- 104,121 ----
        version subpart macros just above PY_VERSION, as appropriate.
  
!   ___ For the next few hours, selectively merge stuff from trunk into
!       branch.  For each change you see on the trunk (i.e. via the
!       python-checkins mailing list), you need to decide whether the
!       change should also be applied to the branch.
! 
!       There is a tension here.  Announcing the branch often jogs
!       people's natural tendency to procrastinate so some very useful
!       patches end up getting checked in at the last moment.  But the
!       Windows and Docs releases tend to be built many hours before the
!       source release, and changes to the branch can force a lot of
!       wasted effort to rebuild them.  The best advice is to be
!       judicious and to consult Fred and Tim before adding anything
!       big.  You really want to avoid skew between the various platform
!       releases.
  
        Note that committers of changes to the trunk SHOULD include in
***************
*** 123,127 ****
        do the Windows release and he likes to stay up late.  This step
        can be pretty tedious, so it's best to get to it immediately
!       after making the branch.
  
        Add high level items new to this release.  E.g. if we're
--- 133,139 ----
        do the Windows release and he likes to stay up late.  This step
        can be pretty tedious, so it's best to get to it immediately
!       after making the branch, or even before you've made the branch.
!       The sooner the better (but again, watch for new checkins up
!       until the release is made!)
  
        Add high level items new to this release.  E.g. if we're