[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 18:36:35 +0100

Paul R wrote:
> Hi Stefan,
> SK> I'm not using 1.5.6 but the latest nightly build: 'mark as resolved'
> SK> works just fine for me.
> SK> I right-click on the file, and choose "mark as resolved" from the
> SK> explorer tsvn submenu.
> SK> From where did you start the 'mark as resolved' action?
> I'm doing exactly that. I think I should state again that this happens
> *only with bitmap files*. This does not happen with other binary
> contents I tried, not even with the same file in .JPG ! This, really, is
> local to the .bmp mime type.
> Also, I'm now almost convinced the error message does not come from tsvn
> but from Windows, because the error message is in french (the language
> of Windows XP) while I've set tsvn to english. Still, the message is
> shown by tsvn, in red, in a list, in a window named "Resolve -
> TortoiseSVN failed!".

That means that the OS threw the error back to TSVN. That's why it is in
your OS language.

> I should also say that unfortunatly I don't know anything about Windows.
> I have tried the same process with the CLI on Gnu/Linux and it worked as
> expected.
> This must be a corner case, but I don't know what to do. If you think
> you can help and it is worth it, please do. Otherwise, I guess I'll have
> to tell my customers not to check-in bitmaps files ;)

Since this only happens for you (tried now several times, yes, with bmp
files) and only with bmp files, I suspect some virus scanner
interferring - maybe the scanner does something with bmps that it
doesn't with other file types.


  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 18:37:33 CET

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