[Python-checkins] CVS: python/dist/src PLAN.txt,1.1.2.6,1.1.2.7

[Tim Peters]

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv23150/descr/dist/src

Modified Files:
      Tag: descr-branch
	PLAN.txt 
Log Message:
Added a "merge notes" section to the end.  This isn't A Plan, it's a
potentially shared whiteboard, but probably of interest only to Tim.


Index: PLAN.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/Attic/PLAN.txt,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -C2 -r1.1.2.6 -r1.1.2.7
*** PLAN.txt	2001/07/04 00:16:02	1.1.2.6
--- PLAN.txt	2001/07/06 04:23:05	1.1.2.7
***************
*** 228,229 ****
--- 228,253 ----
  prototype implementation to test.  Try to do this *before* casting
  everything in stone!
+ 
+ ***************************************************************************
+ ***************************************************************************
+ Merge details (this section is Tim's scratchpad, but should help a lot if
+ he dies of frustration while wrestling with CVS <0.9 wink>).
+ 
+ 2001-07-06
+ 
+ Tagged trunk a bit after midnight, like so:
+ 
+ C:\Code>cvs tag date2001-07-06 python
+ cvs server: Tagging python
+ cvs server: Tagging python/dist
+ cvs server: Tagging python/dist/src
+ T python/dist/src/.cvsignore
+ T python/dist/src/LICENSE
+ T python/dist/src/Makefile.pre.in
+ T python/dist/src/README
+ ... [& about 3000 lines more] ...
+ 
+ This is the first trunk snapshot to be merged into the descr-branch.
+ Gave it a date instead of a goofy name because there's going to be more
+ than one of these, and at least it's obvious which of two ISO dates comes
+ earlier.  These tags should go away after all merging is complete.