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

Re: TSVN 1.8.6 & merge conflict, prefer repository => wrong behavior: chooses local

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sat, 29 Nov 2014 10:57:51 +0100

On 26.11.2014 20:21, Jerome Lalande wrote:
> Hi.
>
> Having the same problem here. For me the problem is mainly with binary files.
>
> I understand, as you explain, that for code files, only the conflicted lines are replaced by repository.
>
> But for binary files, it is not possible to differentiate the conflicted part, so the whole file should be copied, imho.
>
> For example, I just merged a branch containing a few modifications, including a docx file. The mime type of the file is binary (application/octet-stream), but choosing "prefer repository" is not replacing the file, as described by Panu Outinen.
>
> I'm kind of freaked out that this would happen on a large merge, where it would be easy not to notice a missing docx file not modified among hundreds of code files.
>
> Habitually, when merging, I resolve each conflict has it occurs, within the merge dialog.
>
> Could I open a bug on this?
>
> Thanks a lot for your good work!

Already fixed:
https://code.google.com/p/tortoisesvn/source/detail?r=26019

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=3092026
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-11-29 10:58:01 CET

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