[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Unknow error when resolving conflict in bitmaps

From: Paul R <paul.r.ml_at_gmail.com>
Date: Fri, 09 Jan 2009 16:11:30 +0100

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
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1013923
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-01-09 16:20:49 CET

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