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

Re: Strange choice for mime-types

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sat, 10 Apr 2010 09:14:50 +0200

On 10.04.2010 00:09, Dmitriy Kravtsov wrote:
> On 9 april 2010 22:54, Simon Large <simon.tortoisesvn_at_googlemail.com
> <mailto:simon.tortoisesvn_at_googlemail.com>> wrote:
>
>>The resource files are unicode and svn is not unicode-aware although
> TMerge is.
>
> It causes troubles with context menu action "create patch", it displays
> following instead of actual difference(for instance - one for resource.h):
>
> Index: resource.h
> ===================================================================
> Cannot display: file marked as a binary type.
> svn:mime-type = application/octet-stream
>
> Also, TortoiseMerge creates wrong patches for these files, which can be
> reproduced by "svn diff --force"

That's because the svn lib can't handle utf16 files properly when doing
text diffs (no problem of course for other operations).

> By the way I checked - same files for TortoiseBlame don't have this
> mime-type and have an eol-style:normal.

The rc files for TMerge and TProc are in utf16 because of problems we
get otherwise with translations and the special chars other languages use.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2542131
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-04-10 09:15:02 CEST

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

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