[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)
Paul Moore p.f.moore at gmail.com
Mon Sep 10 18:55:54 CEST 2007
- Previous message: [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
- Next message: [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
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
On 10/09/2007, Thomas Wouters <thomas at python.org> wrote:
svnmerge should come with svn, nowadays, or you can download it separately (as svnmerge.py, probably; it's just a Python script.)
It's not part of the Win32 binary distribution for Subversion - but I found it at http://www.orcaware.com/svn/wiki/Svnmerge.py
It doesn't seem to need the Subversion Python libraries. OTOH, I haven't tested it on Windows (but there seems to be Windows code in there, so I'm guessing it's meant to work :-))
Paul
- Previous message: [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
- Next message: [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
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]