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

Re: Problem with interactive merge (conflicts of binary files)

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Thu, 23 Apr 2009 21:54:31 +0200

webpost_at_tigris.org wrote:
> Hello,
>
> I've searched the mailing list for this topic but couldn't find a thread with a solution for my problem.
> From time to time I do an interactive merge (e.g. integrating changes from trunk into a branch) with conflicting versions of binary files. In this situation the 'interactive merge' dialog of TSVN (http://tortoisesvn.net/docs/release/TortoiseSVN_en/images/MergeConflictCallback.png) pops up. Now if I choose to use the revision of the repository ('theirs'), nothing happens and the conflict remains. The local file is not overwritten by the version of the repository. I have to do the same thing again in the 'resolve conflicts' dialog using the context menu of the file list which displays conflicts.
> I find that very uncomfortable. I think that this behaviour started with the 1.6.0 client. I tried 'interacte merge' with the CollabNet command-line client for windows and there the prompt for conflicting files works as expected. Our server has currently version 1.5.4, but I have reproduced that behaviour with a demo client/server-installation as well (version 1.6.1). Changing the svn:mime-type property doesn't seem to help.
> Perhaps someone has the same problem / knows a solution?

Fixed in r16248.

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=1881521
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-04-23 21:54:50 CEST

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