Login | Register
My pages Projects Community openCollabNet

Discussions > users > Re: Unknow error when resolving conflict in bitmaps

Project highlights: :. Download .: :. Support .: :. FAQ .: :. Translations .: :. Donate .: :. Report Bug .:

tortoisesvn
Discussion topic

Back to topic list

Re: Unknow error when resolving conflict in bitmaps

Author steveking
Full name Stefan Küng
Date 2009-01-12 09:37:22 PST
Message 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.

Stefan

--
       ___
  oo // \\ "De Chelonian Mobile"
 (_,\/ \_/ \ TortoiseSVN
   \ \_/_\_/> The coolest Interface to (Sub)Version Control
   /_/ \_\ http://tortoisesvn.net
Attachments

« Previous message in topic | 6 of 8 | Next message in topic »

Messages

Show all messages in topic

Unknow error when resolving conflict in bitmaps Paul R <paul dot r dot ml at gmail dot com> Paul R <paul dot r dot ml at gmail dot com> 2009-01-09 07:20:02 PST
     Re: Unknow error when resolving conflict in bitmaps "Andy Levy" <andy dot levy at gmail dot com> "Andy Levy" <andy dot levy at gmail dot com> 2009-01-09 07:28:18 PST
         Re: Unknow error when resolving conflict in bitmaps Paul R <paul dot r dot ml at gmail dot com> Paul R <paul dot r dot ml at gmail dot com> 2009-01-09 07:39:16 PST
             Re: Unknow error when resolving conflict in bitmaps steveking Stefan Küng 2009-01-09 08:52:58 PST
                 Re: Unknow error when resolving conflict in bitmaps Paul R <paul dot r dot ml at gmail dot com> Paul R <paul dot r dot ml at gmail dot com> 2009-01-12 03:23:57 PST
                     Re: Unknow error when resolving conflict in bitmaps steveking Stefan Küng 2009-01-12 09:37:22 PST
                         Re: Unknow error when resolving conflict in bitmaps Paul R <paul dot r dot ml at gmail dot com> Paul R <paul dot r dot ml at gmail dot com> 2009-01-12 09:55:36 PST
                             Re: Unknow error when resolving conflict in bitmaps steveking Stefan Küng 2009-01-12 10:02:40 PST
Messages per page: