[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

[Mike Klaas]

On 10-Sep-07, at 8:33 AM, Thomas Wouters wrote:

> 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 :)
>

svnmerge also has a handy -M flag that marks a (set of) revisions as  
merged, but doesn't actually do any merging.

-Mike