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

UCS2 support in Subversion

From: Patrick Martin (gmail) <patrickmmartin_at_gmail.com>
Date: 2006-08-10 22:51:30 CEST


I have some Unicode script files that are generated by our testing program
(TestComplete - http://automatedqa.com), and these appear to be UCS2: there
is a BOM pair at the start.

My current problem is that we are using Subversion, for - well, everything
and this is working swimmingly apart from the problem of getting operations
like diff/merge/blame etc. working.

We currently use TortosieSVN as the Subversion client and although the
built-in compare tool does not work, this can be configured for these files
to use something like WinMerge

So, we have a solution for diffing and merging conflicted files, but the
files are becoming conflicted quite often, as Subversion is not handling
the files as text.
Example: user A simply adding a function at the end of a script, and user B
adding a line in the top of the script gets flagged as a conflict.

Also, blame does not work, as the server sees the files as binary...

I can simply run a script to convert to ASCII or utf-8 prior to check-in,
but I'd *prefer* to keep the process as simple as possible. And ideally, as
we will be doing more and more international testing, I'd like to avoid
introducing conversion steps for "international" (our term ;-)) characters
in scripts.

Question 1: is there a mime-type I can set that will make Subversion
1.3.2treat these files as text?

Question 2: will there be in Subversion 1.4 it seems UTF-16 will be
supported - will this work for UCS2?

Question 3: am I missing something obvious that might allow them to be
treated as plain text?


Received on Thu Aug 10 22:52:42 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.