[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merge tool and unicode

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-09-05 21:27:37 CEST

René Vestergaard wrote:
> Background information:
> -----------------------
> Among other things I found an old report from "May 31, 2005"
> about unicode and "TortoiseSVN 1.1.7",
> but could not find anything about unicode in version 1.2.6 or 1.3.5.
>
>
> Question:
> ---------
> Do TortoiseSVN's Merge/diff tool support unicode and
> which version of TortoiseSVN is required for this to be included?

TortoiseMerge can handle UTF16 files in version 1.4.0.
It can handle UTF8 files in previous versions (UTF8 is also unicode, but
not what MS considers unicode in their docs).

If you however refer to the automatic merging of such files during an
update or merge operation, then I have to tell you that Subversion still
handles UTF16 files as binary and doesn't merge them. Even in version 1.4.0.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Sep 5 21:32:46 2006

This is an archived mail posted to the TortoiseSVN Users mailing list.