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

Re: Unknow error when resolving conflict in bitmaps

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Mon, 12 Jan 2009 19:02:33 +0100

Paul R wrote:
> Hi Stefan,
> Stefan> Since this only happens for you (tried now several times, yes,
> Stefan> with bmp files) and only with bmp files, I suspect some virus
> Stefan> scanner interferring - maybe the scanner does something with
> Stefan> bmps that it doesn't with other file types.
> thank you for trying to reproduce. The OS is almost virgin because it
> has been installed with the only goal to put TSVN on it :) So there is
> nothing more than what is installed by default and TSVN, in particular
> there is no antivirus software.
> But let's not worry too much with that. I reported it here because
> I found it and could narrow down the minimal receipe to reproduce on
> this system, but managing bitmap files in a subversion repository is not
> part of my workflow, so no worry. I'll report back here if it happens
> that some relatives or some customers have similar problem.
> Thank you again, TortoiseSVN is a good tool and you are doing a great
> job at maintaining it and running this community (along with the other
> people involved).

Check the svn:mime-type property on your bmp files: there must be one
set to something else than 'text'. If there is none or it is set to
'text', 'text/whatever' then Subversion treats those files as text and
not binary.
Maybe you removed the property accidentally?


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-01-12 19:02:51 CET

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