[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: Andy Levy <andy.levy_at_gmail.com>
Date: Fri, 9 Jan 2009 10:28:17 -0500

On Fri, Jan 9, 2009 at 10:11, Paul R <paul.r.ml_at_gmail.com> wrote:
> 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.

Bitmaps are binary files, which generally can't be "resolved" manually
- you'd need to replace with the "right" version as opposed to
attempting to merge.
Received on 2009-01-09 16:28:28 CET

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