Re: Resolve Conflicts with df error

I looked the diff_file.c source,

  1234 | SVN_ERR(svn_stream_printf_from_utf8(output_stream,
header_encoding, pool,
  1235 | "--- %s" APR_EOL_STR
  1236 | "+++ %s" APR_EOL_STR,
  1237 | original_header,
modified_header));

I think the date string in original_header and modified_header are not UTF-8
Strings,
It use local encoding. So printf it as utf8 would get errors.

2008/11/4 Rock Sun <daijun_at_gmail.com>

> Is it a bug, or I can configure it to work?
>
> 2008/11/4 Rock Sun <daijun_at_gmail.com>
>
> Anyone can answer me? I think it is a bug.
>>
>> 2008/11/3 Rock Sun <daijun_at_gmail.com>
>>
>> I use Subversion 1.5.3, Server and Client both Windows Xp.
>>> And My OS language is Chinese.
>>>
>>> When I updated, I get a conflicts. And I use 'df' command to
>>> see the diff. But I get the outputs:
>>>
>>> svn: Valid UTF-8 data
>>> (hex: 65 78 74 2d 62 61 73 65 2f 61 2e 74 78 74 2e 73 76 6e 2d 62 61 73
>>> 65 09)
>>> followed by invalid UTF-8 sequence
>>> (hex: d0 c7 c6 da)
>>>
>>> I checked the error hex 'd0 c7 c6 da', It is Chinese characters 'ÐÇÆÚ'(
>>> means week)
>>> with the encoding GBK(Chinese Encoding).
>>>
>>> I think the real results should contains time like below,
>>>
>>> --- .svn/text-base/sandwich.txt.svn-base Tue Dec 11 21:33:57 2007
>>>
>>> I think we can just use 2008.12.11 21:22:58, the multi-byte time strings lead to
>>>
>>>
>>>
>>> many errors. Not just here.
>>>
>>>
>>>
>>> --
>>> My Blog: http://rocksun.cn/
>>> My Site: http://www.subversion.org.cn
>>>
>>
>>
>>
>> --
>> My Blog: http://rocksun.cn/
>> My Site: http://www.subversion.org.cn
>>
>
>
>
> --
> My Blog: http://rocksun.cn/
> My Site: http://www.subversion.org.cn
>

-- 
My Blog: http://rocksun.cn/
My Site: http://www.subversion.org.cn