Thanks, but in the future please use svnmerge for this. I've had success with
svnmerge merge -S svn+ssh://[EMAIL PROTECTED]/python/branches/p3yk On 5/9/07, walter.doerwald <[email protected]> wrote: > Author: walter.doerwald > Date: Wed May 9 20:23:50 2007 > New Revision: 55207 > > Modified: > python/branches/py3k-struni/Modules/binascii.c > Log: > Forwardport checkin: > Fix a segfault when b"" was passed to b2a_qp() -- it was using strchr() > instead of memchr(). > > > Modified: python/branches/py3k-struni/Modules/binascii.c > ============================================================================== > --- python/branches/py3k-struni/Modules/binascii.c (original) > +++ python/branches/py3k-struni/Modules/binascii.c Wed May 9 20:23:50 > 2007 > @@ -1150,7 +1150,7 @@ > /* XXX: this function has the side effect of converting all of > * the end of lines to be the same depending on this detection > * here */ > - p = (unsigned char *) strchr((char *)data, '\n'); > + p = (unsigned char *) memchr(data, '\n', datalen); > if ((p != NULL) && (p > data) && (*(p-1) == '\r')) > crlf = 1; > > _______________________________________________ > Python-3000-checkins mailing list > [email protected] > http://mail.python.org/mailman/listinfo/python-3000-checkins > -- --Guido van Rossum (home page: http://www.python.org/~guido/) _______________________________________________ Python-3000-checkins mailing list [email protected] http://mail.python.org/mailman/listinfo/python-3000-checkins
