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

Re: bug: inconsistent behavior between "show changes" and "show changes as a unified diff"

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 29 Sep 2011 15:12:18 +0200

On Thu, Sep 29, 2011 at 03:22, Chris Wilson <wilsotc_at_gmail.com> wrote:
> To reproduce this problem:
> 1) Add .sql files generated from a MS SQL server using TortoiseSVN.
> 2) make a change, and commit
> 3) In the "Log Messages" screen, select a modified .sql file and select
> "show changes". The two revisions are displayed correctly side by side.
> 4) Exit the "show changes" screen, right click on a modified .sql file, and
> select "show changes as a unified diff". You will get a similar message to:
> Index: dbo.ApplicationAccessMain.Table.sql
> ===================================================================
> Cannot display: file marked as a binary type.
> svn:mime-type = application/octet-stream
>
> Either they should both work or neither should work. There isn't an obvious
> way to change force the UDiff utility to treat this file as text in the
> settings.
> This occurs with 1.6.16.21511

Wrong assumption.

Unified diff is in utf8 format and simply can not deal with utf16 files.
TortoiseMerge however can deal with such files and therefore is able
to show a diff.

Since I can't change the unified diff format according to you I should
remove the ability to diff utf16 files from TortoiseMerge?
Sorry, won't do...

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2847779
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-09-29 15:13:30 CEST

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

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