On 7/21/06, Jarl Friis <jarl@softace.dk> wrote:
> After having read the old thread starting at
> http://svn.haxx.se/users/archive-2004-11/1019.shtml
>
> I can see that support for unicode was requested for the svn diff
> functionality. I believe that the conclusion was that it is just a
> question of finding a proper diff tool.
>
> In http://svn.haxx.se/users/archive-2004-11/1067.shtml
> Norbert Unterberg writes:
> > Subversion doesn't (yet) know how to treat UTF-16 files as text for
> > purposes of eol-translation. It can handle UTF-8, of course. Sorry.
>
> However I wonder what is the status for supporting unicode
> (UTF-16) with respect to svn *merge* feature?
Well, in that case, you need to find the right diff3 tool :-) See the
--diff3-cmd command line option.
> I do understand that wrt. storage subversion is completely ignorant of
> the file content, however subversion is capable of merging (ANSI) text
> files and probably also UTF-8 files. But how about UTF-16 ? or other
> Unicode encodings.
Subversion won't merge anything which it's told is binary. If you tell
it your file is text and you have a tool which can merge files of that
content type, you're just ok.
HTH,
Erik.
BTW: I think this is a users@ question as it doesn't directly pertain
development of Subversion. Please continue there.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Jul 22 10:49:53 2006