[Python-3000] [Python-3000-checkins] r58068 - in python/branches/py3k: Doc/library/exceptions.rst Doc/library/socket.rst Doc/whatsnew/2.6.rst Lib/test/test_urllib2net.py Lib/urllib2.py Modules/socketmodule.c (original) (raw)

Thomas Wouters thomas at python.org
Mon Sep 10 17:33:57 CEST 2007

On 9/10/07, gregory.p.smith <python-3000-checkins at python.org> wrote:

Author: gregory.p.smith Date: Mon Sep 10 01:55:55 2007 New Revision: 58068 Modified: python/branches/py3k/Doc/library/exceptions.rst python/branches/py3k/Doc/library/socket.rst python/branches/py3k/Doc/whatsnew/2.6.rst python/branches/py3k/Lib/test/testurllib2net.py python/branches/py3k/Lib/urllib2.py python/branches/py3k/Modules/socketmodule.c Log: merge this from trunk:

Please do these merges with snvmerge. Otherwise, the bookkeeping of what was merged or not gets all messed up, and the next person to use svnmerge will be in a world of hurt. (I know, I've been there.)

py3k% svnmerge merge -r58067 [ resolve conflicts, configure, make, make test ] py3k% svn commit -F svnmerge-commit-message.txt

svnmerge should come with svn, nowadays, or you can download it separately (as svnmerge.py, probably; it's just a Python script.)

Alternatively, if you know what you're doing, you can edit the svnmerge-integrated property on the branch directly -- but don't mess it up :)

-- Thomas Wouters <thomas at python.org>

Hi! I'm a .signature virus! copy me into your .signature file to help me spread! -------------- next part -------------- An HTML attachment was scrubbed... URL: http://mail.python.org/pipermail/python-3000/attachments/20070910/94ad3eb0/attachment.htm

More information about the Python-3000 mailing list