[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: Bill Bill <syoma755_at_gmail.com>
Date: Thu, 19 Jun 2014 09:39:17 -0700 (PDT)

I can confirm problem from Panu.
I use TortoiseSVN Client 1.8.7 Build 25475 on Win XP 32bit

I have the same situation:
Trunk and branch contain binary files. Branch contains newer revision of the binary.
When merging the branch to working copy of trunk using "Merge a range of revisions" command the Resolve Conflict dialog appears for binary file.

Choosing "Prefer Repository" there does not result in updating of working copy with repository version , as stated in documentation for binary files. Instead a local file remains.

I think this is a bug.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-06-19 18:47:30 CEST

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