[Python-checkins] CVS: python/dist/src PLAN.txt,1.1.2.18,1.1.2.19

[Tim Peters]

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

Modified Files:
      Tag: descr-branch
	PLAN.txt 
Log Message:
Added editorial about merge frequency.


Index: PLAN.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/Attic/PLAN.txt,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -C2 -r1.1.2.18 -r1.1.2.19
*** PLAN.txt	2001/07/08 01:38:59	1.1.2.18
--- PLAN.txt	2001/07/08 02:07:09	1.1.2.19
***************
*** 197,200 ****
--- 197,214 ----
  later.
  
+ Note from Tim:  We should never again wait until literally 100s of files
+ are out of synch.  I don't care how often I need to do this, provided only
+ that it's a tractable task each time.  Once per week sounds like a good
+ idea.  As is, even the trunk change to rangeobject.c created more than its
+ proper share of merge headaches, because it confused all the other reasons
+ include file merges were getting conflicts (the more changes there are, the
+ worse diff does; indeed, I came up with the ndiff algorithm in the 80s
+ precisely because the source-control diff program Cray used at the time
+ produced minimal but *senseless* diffs, thus creating artificial conflicts;
+ paying unbounded attention to context does a much better job of putting
+ changes where they make semantic sense too; but we're stuck with Unix diff
+ here, and it isn't robust in this sense; if we don't keep its job simple,
+ it will make my job hell).
+ 
  Done:
  To undo or rename before final merge:  Modules/spam.c has worked its