Unable to apply patch that contains Japanese text

Today, I have upgraded TortoiseSVN to the 1.3.0 release.
Then I found that TortoiseMerge rejects any patch that contains
Japanese text(cp932). The error message shows a pair of unmatching
text and the former of them seems to be badly decoded.

I looked into source, and found a questionable change in
TortoiseSVN/src/TortoiseMerge/Patch.cpp at r5349.

> - if (m_UnicodeType != CFileTextLines::UTF8)
> + if ((m_UnicodeType != CFileTextLines::UTF8)&&(m_UnicodeType != CFileTextLines::UTF8BOM))
> {
> - if (PatchLines.GetUnicodeType()==CFileTextLines::UTF8)
> + if ((PatchLines.GetUnicodeType()==CFileTextLines::UTF8)||(m_UnicodeType != CFileTextLines::UTF8BOM))

I think that the second part was intended to be like
    if((PatchLines.GetUnicodeType()==CFileTextLines::UTF8)||(PatchLines.GetUnicodeType()==CFileTextLines::UTF8BOM))
isn't it?
Otherwise sPatchLine is converted as UTF8 text though actually it is not.

I examined that RC1(r5301, before above revision) can apply a patch
that contains Japanese text.

Best regards.

--
k_satoda
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org