[Python-checkins] CVS: python/dist/src PLAN.txt,1.2,1.3

2001年8月02日 15:06:37 -0700

Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv8302/python/dist/src
Modified Files:
	PLAN.txt 
Log Message:
Finish my log of the final merge process. Mark the merge task complete.
Index: PLAN.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/PLAN.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PLAN.txt	2001年08月02日 04:15:00	1.2
--- PLAN.txt	2001年08月02日 22:06:35	1.3
***************
*** 185,189 ****

! Project: integration with main branch
 *************************************

--- 185,189 ----

! Project: integration with main branch *** This is done - tim ***
 *************************************

***************
*** 218,222 ****
 way into the branch Unix and Windows builds (pythoncore.dsp and
 PC/config.c); also imported by test_descr.py. How about renaming to
! xxsubtype.c (whatever) now?

--- 218,222 ----
 way into the branch Unix and Windows builds (pythoncore.dsp and
 PC/config.c); also imported by test_descr.py. How about renaming to
! xxsubtype.c (whatever) now? *** this is done - tim ***

***************
*** 281,285 ****
 Rebuilt from scratch; ran all tests; checked into branch about 22:40.

! Merged descr-branch back into trunk:
 cvs -q -z3 up -j descr-branch python

--- 281,287 ----
 Rebuilt from scratch; ran all tests; checked into branch about 22:40.

! Merged descr-branch back into trunk (SEE BELOW -- this specific way of
! doing it was a bad idea):
! 
 cvs -q -z3 up -j descr-branch python

***************
*** 288,295 ****
 conflicts in dictobject.c, sometimes enclosing identical(!) blobs of
 source code. And CVS remains utterly baffled by Python type object decls.
! Every line of ceval.c's generator code si in conflict blocks ... OK,
 there's no pattern or sense here, I'll just deal with it.

! Conflicts resolved; rebuilt from scratch; test_weakref fails.
 ----------------------------------------------------------------------------
 2001年07月30日
--- 290,313 ----
 conflicts in dictobject.c, sometimes enclosing identical(!) blobs of
 source code. And CVS remains utterly baffled by Python type object decls.
! Every line of ceval.c's generator code is in conflict blocks ... OK,
 there's no pattern or sense here, I'll just deal with it.

! Conflicts resolved; rebuilt from scratch; test_weakref fails. Didn't find
! an obvious reason and it was late, so committed it anyway. Tagged the
! trunk then with tag:
! 
! after-descr-branch-merge
! 
! Tracked the test_weakref failure to a botched conflict resolution in
! classobject.c; checked in a fix.
! 
! LATER: The merge should have been done via:
! 
! upd -j date2001-08-01 -j descr-branch python
! 
! instead. This would have caused only one conflict, a baffler in
! bltinmodule.c. It would have avoided the classobject.c error I made.
! Luckily, except for that one, we got to the same place in the end anyway,
! apart from a few curious tabs-vs-spaces differences.
 ----------------------------------------------------------------------------
 2001年07月30日