[Python-checkins] CVS: python/dist/src PLAN.txt,1.1.2.8,1.1.2.9

[Tim Peters]

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

Modified Files:
      Tag: descr-branch
	PLAN.txt 
Log Message:
Add screen dump from merge-from-trunk stab.


Index: PLAN.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/Attic/PLAN.txt,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -C2 -r1.1.2.8 -r1.1.2.9
*** PLAN.txt	2001/07/06 04:53:22	1.1.2.8
--- PLAN.txt	2001/07/06 05:23:35	1.1.2.9
***************
*** 234,244 ****
  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:
[...1141 lines suppressed...]
+ U mergedescr/dist/src/Tools/scripts/rgrep.py
+ U mergedescr/dist/src/Tools/scripts/suff.py
+ U mergedescr/dist/src/Tools/scripts/sum5.py
+ U mergedescr/dist/src/Tools/scripts/texi2html.py
+ U mergedescr/dist/src/Tools/scripts/trace.py
+ U mergedescr/dist/src/Tools/scripts/treesync.py
+ U mergedescr/dist/src/Tools/scripts/untabify.py
+ U mergedescr/dist/src/Tools/scripts/which.py
+ U mergedescr/dist/src/Tools/scripts/xxci.py
+ ------------------------------------------------------------------
+ 2001-07-06
+ 
  Tagged trunk a bit after midnight, like so:
  
***************
*** 257,258 ****
--- 1399,1401 ----
  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.
+ MERGE END ******************************************************************