Re: [python-committers] Anyone having issues with svnmerge.py and 2.6 (possibly OS X problem)?

2009-08-13 Thread Brett Cannon
On Thu, Aug 13, 2009 at 15:15, "Martin v. Löwis" wrote: > > Hmm. Given the presence of 'mac_roman.py' in the traceback, I wonder if > > Issue 6202 has any relevance here? > > Only partially so. That character (LATIN SMALL LETTER C WITH ACUTE) is > not supported by Mac-roman, so the codec is righ

Re: [python-committers] Anyone having issues with svnmerge.py and 2.6 (possibly OS X problem)?

2009-08-13 Thread Martin v. Löwis
> Hmm. Given the presence of 'mac_roman.py' in the traceback, I wonder if > Issue 6202 has any relevance here? Only partially so. That character (LATIN SMALL LETTER C WITH ACUTE) is not supported by Mac-roman, so the codec is right in complaining that it can't encode it. And yes, had svnmerge bee

Re: [python-committers] Anyone having issues with svnmerge.py and 2.6 (possibly OS X problem)?

2009-08-13 Thread Brett Cannon
On Thu, Aug 13, 2009 at 14:03, Jerry Seutter wrote: > > > On Thu, Aug 13, 2009 at 1:44 PM, Brett Cannon wrote: > >> I am trying to backport something to 2.6 and I am getting the following >> error from svnmerge.py: >> > svnmerge.py merge -r74429t >> property 'svnmerge-integrated' deleted from '.

Re: [python-committers] Anyone having issues with svnmerge.py and 2.6 (possibly OS X problem)?

2009-08-13 Thread Brett Cannon
On Thu, Aug 13, 2009 at 14:15, R. David Murray wrote: > On Thu, 13 Aug 2009 at 15:03, Jerry Seutter wrote: > >> On Thu, Aug 13, 2009 at 1:44 PM, Brett Cannon wrote: >> >>> File "/Users/brett/.slash/python/lib/python2.6/encodings/mac_roman.py", >>> line 12, in encode >>>return codecs.charmap_

Re: [python-committers] Anyone having issues with svnmerge.py and 2.6 (possibly OS X problem)?

2009-08-13 Thread R. David Murray
On Thu, 13 Aug 2009 at 15:03, Jerry Seutter wrote: On Thu, Aug 13, 2009 at 1:44 PM, Brett Cannon wrote: File "/Users/brett/.slash/python/lib/python2.6/encodings/mac_roman.py", line 12, in encode return codecs.charmap_encode(input,errors,encoding_table) UnicodeEncodeError: 'charmap' codec

Re: [python-committers] Anyone having issues with svnmerge.py and 2.6 (possibly OS X problem)?

2009-08-13 Thread Jerry Seutter
On Thu, Aug 13, 2009 at 1:44 PM, Brett Cannon wrote: > I am trying to backport something to 2.6 and I am getting the following > error from svnmerge.py: > > svnmerge.py merge -r74429t > property 'svnmerge-integrated' deleted from '.'. > > property 'svnmerge-blocked' deleted from '.'. > > --- Merg

Re: [python-committers] Anyone having issues with svnmerge.py and 2.6 (possibly OS X problem)?

2009-08-13 Thread Guilherme Polo
2009/8/13 Brett Cannon : > I am trying to backport something to 2.6 and I am getting the following > error from svnmerge.py: >> svnmerge.py merge -r74429t > property 'svnmerge-integrated' deleted from '.'. > property 'svnmerge-blocked' deleted from '.'. > --- Merging r74429 into '.': > C    Misc/NE

[python-committers] Anyone having issues with svnmerge.py and 2.6 (possibly OS X problem)?

2009-08-13 Thread Brett Cannon
I am trying to backport something to 2.6 and I am getting the following error from svnmerge.py: > svnmerge.py merge -r74429t property 'svnmerge-integrated' deleted from '.'. property 'svnmerge-blocked' deleted from '.'. --- Merging r74429 into '.': CMisc/NEWS UMisc/ACKS ULib/test/test

Re: [python-committers] 3.1 maint frozen

2009-08-13 Thread R. David Murray
On Thu, 13 Aug 2009 at 09:00, Brett Cannon wrote: Is this an alpha or beta cut for 3.1.1? I have a crasher fix I plan to commit later today. It's an RC. --David ___ python-committers mailing list python-committers@python.org http://mail.python.org/ma

Re: [python-committers] 3.1 maint frozen

2009-08-13 Thread Benjamin Peterson
2009/8/13 Brett Cannon : > Is this an alpha or beta cut for 3.1.1? I have a crasher fix I plan to > commit later today. I'm calling it an RC. Feel free to commit that fix now that I've tagged the release. -- Regards, Benjamin ___ python-committers ma

Re: [python-committers] 3.1 maint frozen

2009-08-13 Thread Brett Cannon
Is this an alpha or beta cut for 3.1.1? I have a crasher fix I plan to commit later today. On Aug 13, 2009 8:18 AM, "Benjamin Peterson" wrote: I'm going to start working on 3.1.1 now. Please no commits to it. -- Regards, Benjamin ___ python-committers

[python-committers] 3.1 maint frozen

2009-08-13 Thread Benjamin Peterson
I'm going to start working on 3.1.1 now. Please no commits to it. -- Regards, Benjamin ___ python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers