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

Re: Unicode files

From: Jarl Friis <jarl_at_softace.dk>
Date: 2006-07-23 20:30:09 CEST

Hi Erik.

Thanks for your reply.

"Erik Huelsmann" <ehuels@gmail.com> writes:

> Well, in that case, you need to find the right diff3 tool :-) See the
> --diff3-cmd command line option.

Not until now do I realise that the diff3-cmd (if specified) is
actually used for merging, thanks.

> 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.

Thanks.

> BTW: I think this is a users@ question as it doesn't directly pertain
> development of Subversion. Please continue there.

I did ask earlier on the users-list, but never got any replies, hence
the post on the dev list.

I do admit however, that I deserve a "RTFM", because have I read the
man page for diff3, I would have realised it is actually a *merge* tool.

Yet...

It is clear to me now that it is possible, by specifying external tools,
to achieve what I want: merge facility for unicode (UCS2) files. However I
would like to ask (on dev-list), if it is on the plan to make this an
integrated feature of Subversion? Or if there is any good reason for
explicitely not supporting any other text file encodings than
supersets of ASCII?

Jarl

-- 
Jarl Friis
Softace ApS
Omøgade 8, 2.sal
2100 København Ø.
Denmark
Phone:  +45 26 13 20 90
E-mail: jarl@softace.dk
LinkedIn: https://www.linkedin.com/in/jarlfriis
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Jul 23 20:30:41 2006

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