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

Hide all messages in topic

All messages in topic

Re: Unknow error when resolving conflict in bitmaps

Author steveking
Full name Stefan Küng
Date 2009-01-12 10:02:40 PST
Message 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?

Stefan

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

Re: Unknow error when resolving conflict in bitmaps

Author Paul R <paul dot r dot ml at gmail dot com>
Full name Paul R <paul dot r dot ml at gmail dot com>
Date 2009-01-12 09:55:36 PST
Message 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).

Regards,


--
  Paul

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

Re: Unknow error when resolving conflict in bitmaps

Author Paul R <paul dot r dot ml at gmail dot com>
Full name Paul R <paul dot r dot ml at gmail dot com>
Date 2009-01-12 03:23:57 PST
Message 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

Re: Unknow error when resolving conflict in bitmaps

Author steveking
Full name Stefan Küng
Date 2009-01-09 08:52:58 PST
Message Paul R wrote:
> Paul> 6. try to resolve conflict, it will raise an unknown error
>
> Andy> Bitmaps are binary files, which generally can't be "resolved"
> Andy> manually - you'd need to replace with the "right" version as
> Andy> opposed to attempting to merge.
>
> I should have written, as step 6., "mark conflict as resolved". This is
> not about the way files get merged but really about removing conflict
> mark from a conflicting bitmap file.
>
> BTW, can you reproduce or not please ? I tried on 2 different client
> systems (WinXP, TSVN 1.5.6), but with the same repository. The
> repository is on a subversion 1.4.4 server IIRC.

I'm not using 1.5.6 but the latest nightly build: 'mark as resolved'
works just fine for me.

I right-click on the file, and choose "mark as resolved" from the
explorer tsvn submenu.

From where did you start the 'mark as resolved' action?

Stefan

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

Re: Unknow error when resolving conflict in bitmaps

Author Paul R <paul dot r dot ml at gmail dot com>
Full name Paul R <paul dot r dot ml at gmail dot com>
Date 2009-01-09 07:39:16 PST
Message Paul> 6. try to resolve conflict, it will raise an unknown error

Andy> Bitmaps are binary files, which generally can't be "resolved"
Andy> manually - you'd need to replace with the "right" version as
Andy> opposed to attempting to merge.

I should have written, as step 6., "mark conflict as resolved". This is
not about the way files get merged but really about removing conflict
mark from a conflicting bitmap file.

BTW, can you reproduce or not please ? I tried on 2 different client
systems (WinXP, TSVN 1.5.6), but with the same repository. The
repository is on a subversion 1.4.4 server IIRC.

Thanks,


--
  Paul

Re: Unknow error when resolving conflict in bitmaps

Author "Andy Levy" <andy dot levy at gmail dot com>
Full name "Andy Levy" <andy dot levy at gmail dot com>
Date 2009-01-09 07:28:18 PST
Message
Attachments

Unknow error when resolving conflict in bitmaps

Author Paul R <paul dot r dot ml at gmail dot com>
Full name Paul R <paul dot r dot ml at gmail dot com>
Date 2009-01-09 07:20:02 PST
Message Hello,

with TortoiseSVN 1.5.6 on Windows XP, I can't resolve simple conflicts
in bitmap files.

Step to reproduce :

 1. checkout a repository in folder A and in folder B
 2. create a new bitmap file "file.bmp" in A, add and commit
 3. update B
 4. modify file.bmp in A then commit
 5. modify file.bmp in B then update. file.bmp will be marked as
    conflicting
 6. try to resolve conflict, it will raise an unknown error

I can't reproduce it with text files and with OpenDocument file so it
really seems to have something to do with bitmap files.

Thanks for this great software.


--
  Paul
Messages per page: