I think I'm done now...

[Chris Dolan]

On May 2, 2006, at 11:33 AM, Jeff Waugh wrote:

> <quote who="Sam Ruby">
>
>> I've made fixes for HTTP status codes, added an optional (and, by  
>> default,
>> off) feature for identifying feeds that haven't been updating, and  
>> made
>> the OPML validate.
>>
>> http://planet.intertwingly.net/bzr/
>>
>> What I would like to see is some or all of this merged into  
>> "Jeff's devel
>> repo".
>
> This new set hasn't made it in, but the previous lot did.

Help!  I just did "bzr merge" from Jeff and get the following from  
"bzr status":

... [snip] ...
pending merges:
   Jeff Waugh 2006-05-03 merge from sam
     Sam Ruby 2006-05-02 Produce OPML that conforms to the Guidelines  
for val...
     ... [snip] ...
     Sam Ruby 2006-04-21 Autodiscovery and Atom feed improvments
     Sam Ruby 2006-04-21 Common feed icon
     bzr: ERROR: 'ascii' codec can't encode character u'\xe9' in  
position 60: ordinal not in range(128)
   command: '/sw/bin/bzr' 'status'
       pwd: u'/Users/chris/Documents/planet'
     error: exceptions.UnicodeEncodeError
   at /sw/lib/python2.4/site-packages/bzrlib/status.py line 108, in  
show_status()
   see ~/.bzr.log for debug information

I'm very new to bzr (installed via Fink on my Mac) and don't  
understand this error message.
Chris
--
Chris Dolan, Software Developer, http://www.chrisdolan.net/
Public key: http://www.chrisdolan.net/public.key
vCard: http://www.chrisdolan.net/ChrisDolan.vcf