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

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

From: Jerome Lalande <jerome.lalande_at_gmail.com>
Date: Wed, 26 Nov 2014 11:21:06 -0800 (PST)

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!

Using TortoiseSVN 1.8.8, Build 25755 - 64 Bit , 2014/08/10 14:44:06, on Win7 x64

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3091895

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-11-26 20:23:00 CET

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