On 9/10/07, <b class="gmail_sendername">Thomas Wouters</b> <<a href="mailto:thomas@python.org">thomas@python.org</a>> wrote:<div><span class="gmail_quote"></span><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
<br><div><span class="gmail_quote">On 9/10/07, <b class="gmail_sendername">gregory.p.smith</b> <<a href="mailto:python-3000-checkins@python.org" target="_blank" onclick="return top.js.OpenExtLink(window,event,this)">python-3000-checkins@python.org
</a>> wrote:</span><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
Author: gregory.p.smith<br>Date: Mon Sep 10 01:55:55 2007<br>New Revision: 58068<br><br>Modified:<br> python/branches/py3k/Doc/library/exceptions.rst<br> python/branches/py3k/Doc/library/socket.rst<br> python/branches/py3k/Doc/whatsnew/2.6.rst
<br> python/branches/py3k/Lib/test/test_urllib2net.py<br> python/branches/py3k/Lib/urllib2.py<br> python/branches/py3k/Modules/socketmodule.c<br>Log:<br>merge this from trunk:</blockquote><div><br>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.)
<br></div><br>py3k% svnmerge merge -r58067<br>[ resolve conflicts, configure, make, make test ]<br>py3k% svn commit -F svnmerge-commit-message.txt<br></div><br>svnmerge should come with svn, nowadays, or you can download it separately (as
svnmerge.py, probably; it's just a Python script.)<br><br>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 :)</blockquote>
<div><br>Sorry about that & thanks for the pointers, I'll use svnmerge (instead of "svn merge" or "svn diff | patch" which i had been using) in the future.<br><br>-gps<br><br></div></div>