[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: Paul R <paul.r.ml_at_gmail.com>
Date: Fri, 09 Jan 2009 16:39:03 +0100

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

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