Login | Register
My pages Projects Community openCollabNet

Discussions > users > Re: Unknow error when resolving conflict in bitmaps

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

tortoisesvn
Discussion topic

Back to topic list

Re: Unknow error when resolving conflict in bitmaps

Author steveking
Full name Stefan Küng
Date 2009-01-09 08:52:58 PST
Message 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
Attachments

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