[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: Paul R <paul.r.ml_at_gmail.com>
Date: Mon, 12 Jan 2009 12:23:21 +0100

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

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 ;)

Regards,

-- 
  Paul
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1018865
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-01-12 12:26:33 CET

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