[Python-checkins] CVS: python/dist/src PLAN.txt,1.1.2.12,1.1.2.13
Tim Peters
tim_one@users.sourceforge.net
Fri, 06 Jul 2001 14:28:43 -0700
Update of /cvsroot/python/python/dist/src
In directory usw-pr-cvs1:/tmp/cvs-serv8263/descr/dist/src
Modified Files:
Tag: descr-branch
PLAN.txt
Log Message:
Added a section for recording merge glitches.
Nuked a few hundred lines from the merge screen dump, corresponding to
merge changes that have already been committed.
Index: PLAN.txt
===================================================================
RCS file: /cvsroot/python/python/dist/src/Attic/PLAN.txt,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -C2 -r1.1.2.12 -r1.1.2.13
*** PLAN.txt 2001/07/06 20:03:59 1.1.2.12
--- PLAN.txt 2001/07/06 21:28:40 1.1.2.13
***************
*** 240,249 ****
------------------------------------------------------------------
2001-07-06
! Screen dump from initial merge attempt (which had the happy side-effect of
! forcing me to learn that my *editor* is smart enough to capture DOS-box
! output on Win98 -- command.com sure isn't). Lots of merges, but "only" 15
! conflicts:
C:\Code>cvs -q -z3 up -j date2001-07-06 mergedescr
--- 240,267 ----
------------------------------------------------------------------
+ Merge glitches:
+
+ + test_unicode.py fails, but due to this oddity (cause unknown, but more
+ Unicode changes still need to be merged):
+
+ >>> "%*d" % (5, u"abc")
+ Traceback (most recent call last):
+ File "<stdin>", line 1, in ?
+ TypeError: an integer is required
+ >>>
+
+ + test___all__.py yields:
+
+ c:\code\descr\dist\src\lib\FCNTL.py:7: DeprecationWarning: the FCNTL
+ module is deprecated; please use fcntl
+
+ Assuming this will go away when newer test___all__ gets merged (but it
+ can't now, because it imports other new stuff that can't yet be merged
+ until its implementation code is merged, etc).
+ ------------------------------------------------------------------
2001-07-06
! Screen dump from initial merge attempt, less the lines that apply to files
! already merged.
C:\Code>cvs -q -z3 up -j date2001-07-06 mergedescr
***************
*** 356,361 ****
retrieving revision 1.9
Merging differences between 1.8 and 1.9 into Cookie.py
- U mergedescr/dist/src/Lib/FCNTL.py
- U mergedescr/dist/src/Lib/HTMLParser.py
RCS file: /cvsroot/python/python/dist/src/Lib/UserDict.py,v
retrieving revision 1.12
--- 374,377 ----
***************
*** 402,409 ****
retrieving revision 1.16
Merging differences between 1.15 and 1.16 into code.py
- RCS file: /cvsroot/python/python/dist/src/Lib/codecs.py,v
- retrieving revision 1.16
- retrieving revision 1.19
- Merging differences between 1.16 and 1.19 into codecs.py
RCS file: /cvsroot/python/python/dist/src/Lib/dbhash.py,v
retrieving revision 1.5
--- 418,421 ----
***************
*** 594,852 ****
retrieving revision 1.22
Merging differences between 1.21 and 1.22 into bdist_wininst.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/aliases.py,v
- retrieving revision 1.4
- retrieving revision 1.8
- Merging differences between 1.4 and 1.8 into aliases.py
- U mergedescr/dist/src/Lib/encodings/base64_codec.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp037.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp037.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp1006.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp1006.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp1026.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp1026.py
- U mergedescr/dist/src/Lib/encodings/cp1140.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp1250.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp1250.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp1251.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp1251.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp1252.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp1252.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp1253.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp1253.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp1254.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp1254.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp1255.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp1255.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp1256.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp1256.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp1257.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp1257.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp1258.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp1258.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp424.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp424.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp437.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp437.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp500.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp500.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp737.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp737.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp775.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp775.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp850.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp850.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp852.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp852.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp855.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp855.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp856.py,v
- retrieving revision 1.3
- retrieving revision 1.4
- Merging differences between 1.3 and 1.4 into cp856.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp857.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp857.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp860.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp860.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp861.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp861.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp862.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp862.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp863.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp863.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp864.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp864.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp865.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp865.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp866.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp866.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp869.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp869.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp874.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp874.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/cp875.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into cp875.py
- U mergedescr/dist/src/Lib/encodings/hex_codec.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/iso8859_1.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into iso8859_1.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/iso8859_10.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into iso8859_10.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/iso8859_13.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into iso8859_13.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/iso8859_14.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into iso8859_14.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/iso8859_15.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into iso8859_15.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/iso8859_2.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into iso8859_2.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/iso8859_3.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into iso8859_3.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/iso8859_4.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into iso8859_4.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/iso8859_5.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into iso8859_5.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/iso8859_6.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into iso8859_6.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/iso8859_7.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into iso8859_7.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/iso8859_8.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into iso8859_8.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/iso8859_9.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into iso8859_9.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/koi8_r.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into koi8_r.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/mac_cyrillic.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into mac_cyrillic.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/mac_greek.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into mac_greek.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/mac_iceland.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into mac_iceland.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/mac_latin2.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into mac_latin2.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/mac_roman.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into mac_roman.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/mac_turkish.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into mac_turkish.py
- U mergedescr/dist/src/Lib/encodings/quopri_codec.py
- U mergedescr/dist/src/Lib/encodings/rot_13.py
- RCS file: /cvsroot/python/python/dist/src/Lib/encodings/utf_16.py,v
- retrieving revision 1.1
- retrieving revision 1.2
- Merging differences between 1.1 and 1.2 into utf_16.py
- U mergedescr/dist/src/Lib/encodings/uu_codec.py
- U mergedescr/dist/src/Lib/encodings/zlib_codec.py
RCS file: /cvsroot/python/python/dist/src/Lib/lib-old/lockfile.py,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into lockfile.py
- RCS file: /cvsroot/python/python/dist/src/Lib/plat-next3/regen,v
- retrieving revision 1.1
- retrieving revision 1.2
- Merging differences between 1.1 and 1.2 into regen
- RCS file: /cvsroot/python/python/dist/src/Lib/plat-riscos/riscosenviron.py,v
- retrieving revision 1.3
- retrieving revision 1.4
- Merging differences between 1.3 and 1.4 into riscosenviron.py
- RCS file: /cvsroot/python/python/dist/src/Lib/plat-riscos/riscospath.py,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into riscospath.py
- RCS file: /cvsroot/python/python/dist/src/Lib/plat-riscos/rourl2path.py,v
- retrieving revision 1.1
- retrieving revision 1.2
- Merging differences between 1.1 and 1.2 into rourl2path.py
- RCS file: /cvsroot/python/python/dist/src/Lib/plat-sunos4/regen,v
- retrieving revision 1.2
- retrieving revision 1.3
- Merging differences between 1.2 and 1.3 into regen
- RCS file: /cvsroot/python/python/dist/src/Lib/plat-sunos5/regen,v
- retrieving revision 1.3
- retrieving revision 1.4
- Merging differences between 1.3 and 1.4 into regen
- RCS file: /cvsroot/python/python/dist/src/Lib/test/README,v
- retrieving revision 1.6
- retrieving revision 1.9
- Merging differences between 1.6 and 1.9 into README
U mergedescr/dist/src/Lib/test/double_const.py
RCS file: /cvsroot/python/python/dist/src/Lib/test/re_tests.py,v
--- 606,613 ----
***************
*** 854,861 ****
retrieving revision 1.29
Merging differences between 1.28 and 1.29 into re_tests.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/regrtest.py,v
- retrieving revision 1.33
- retrieving revision 1.36
- Merging differences between 1.33 and 1.36 into regrtest.py
RCS file: /cvsroot/python/python/dist/src/Lib/test/string_tests.py,v
retrieving revision 1.7
--- 615,618 ----
***************
*** 998,1006 ****
retrieving revision 1.13
Merging differences between 1.7 and 1.13 into test_struct.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_support.py,v
- retrieving revision 1.21
- retrieving revision 1.23
- Merging differences between 1.21 and 1.23 into test_support.py
- U mergedescr/dist/src/Lib/test/test_threaded_import.py
RCS file: /cvsroot/python/python/dist/src/Lib/test/test_time.py,v
retrieving revision 1.6
--- 755,758 ----
***************
*** 1011,1018 ****
retrieving revision 1.21
Merging differences between 1.20 and 1.21 into test_types.py
- RCS file: /cvsroot/python/python/dist/src/Lib/test/test_unicode.py,v
- retrieving revision 1.31
- retrieving revision 1.34
- Merging differences between 1.31 and 1.34 into test_unicode.py
U mergedescr/dist/src/Lib/test/test_unicode_file.py
U mergedescr/dist/src/Lib/test/test_urllib2.py
--- 763,766 ----
***************
*** 1332,1384 ****
retrieving revision 2.88
Merging differences between 2.85 and 2.88 into sysmodule.c
- U mergedescr/dist/src/Tools/README
- U mergedescr/dist/src/Tools/scripts/README
- U mergedescr/dist/src/Tools/scripts/byteyears.py
- U mergedescr/dist/src/Tools/scripts/checkappend.py
- U mergedescr/dist/src/Tools/scripts/checkpyc.py
- U mergedescr/dist/src/Tools/scripts/classfix.py
- U mergedescr/dist/src/Tools/scripts/copytime.py
- U mergedescr/dist/src/Tools/scripts/crlf.py
- U mergedescr/dist/src/Tools/scripts/cvsfiles.py
- U mergedescr/dist/src/Tools/scripts/dutree.doc
- U mergedescr/dist/src/Tools/scripts/dutree.py
- U mergedescr/dist/src/Tools/scripts/eptags.py
- U mergedescr/dist/src/Tools/scripts/findlinksto.py
- U mergedescr/dist/src/Tools/scripts/fixcid.py
- U mergedescr/dist/src/Tools/scripts/fixheader.py
- U mergedescr/dist/src/Tools/scripts/fixnotice.py
- U mergedescr/dist/src/Tools/scripts/fixps.py
- U mergedescr/dist/src/Tools/scripts/ftpmirror.py
- U mergedescr/dist/src/Tools/scripts/gencodec.py
- U mergedescr/dist/src/Tools/scripts/h2py.py
- U mergedescr/dist/src/Tools/scripts/ifdef.py
- U mergedescr/dist/src/Tools/scripts/lfcr.py
- U mergedescr/dist/src/Tools/scripts/linktree.py
- U mergedescr/dist/src/Tools/scripts/lll.py
- U mergedescr/dist/src/Tools/scripts/logmerge.py
- U mergedescr/dist/src/Tools/scripts/mailerdaemon.py
- U mergedescr/dist/src/Tools/scripts/md5sum.py
- U mergedescr/dist/src/Tools/scripts/methfix.py
- U mergedescr/dist/src/Tools/scripts/mkreal.py
- U mergedescr/dist/src/Tools/scripts/ndiff.py
- U mergedescr/dist/src/Tools/scripts/nm2def.py
- U mergedescr/dist/src/Tools/scripts/objgraph.py
- U mergedescr/dist/src/Tools/scripts/parseentities.py
- U mergedescr/dist/src/Tools/scripts/pathfix.py
- U mergedescr/dist/src/Tools/scripts/pdeps.py
- U mergedescr/dist/src/Tools/scripts/pindent.py
- U mergedescr/dist/src/Tools/scripts/ptags.py
- U mergedescr/dist/src/Tools/scripts/pydoc.pyw
- U mergedescr/dist/src/Tools/scripts/redemo.py
- U mergedescr/dist/src/Tools/scripts/reindent.py
- 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
--- 1080,1083 ----