[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 09 Jan 2009 17:52:46 +0100

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
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1014035
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-01-09 17:53:09 CET

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