You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@subversion.apache.org by Mattias Engdegård <ma...@bredband.net> on 2013/05/12 15:05:03 UTC

Re: Incorrect UTF-8-smashing of conflict localisations

14 apr 2013 kl. 14.20 skrev Mattias Engdeg�rd:

> When a property conflict is presented, some localised messages will  
> be mutilated.

This patch fixes the bug.

[[[
When generating the .prej file for property conflicts, don't destroy
the inserted localised strings by converting the entire file to ASCII;
only the property values should be converted.

* subversion/libsvn_wc/props.c
   (append_prop_conflict): Don't call svn_utf_cstring_from_utf8_fuzzy.
   (prop_conflict_from_skel): Convert property data to ASCII first.
]]]

Re: Incorrect UTF-8-smashing of conflict localisations

Posted by Mattias Engdegård <ma...@bredband.net>.

12 maj 2013 kl. 18.18 skrev Stefan Sperling:

>> This patch fixes the bug.
>
> +1, thanks.

Committed in r1481981.

Re: Incorrect UTF-8-smashing of conflict localisations

Posted by Stefan Sperling <st...@elego.de>.

On Sun, May 12, 2013 at 03:05:03PM +0200, Mattias Engdegård wrote:
> 14 apr 2013 kl. 14.20 skrev Mattias Engdegård:
> 
> >When a property conflict is presented, some localised messages
> >will be mutilated.
> 
> This patch fixes the bug.

+1, thanks.