Login | Register
My pages Projects Community openCollabNet

Discussions > users > Unknow error when resolving conflict in bitmaps

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

tortoisesvn
Discussion topic

Back to topic list

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

« Previous message in topic | 1 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: