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

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

From: Panu Outinen <panu.outinen_at_vertex.fi>
Date: Thu, 08 May 2014 11:56:48 +0300

Hi!

I'm running TortoiseSVN 1.8.6, Build 25419 - 64 Bit on Win7 x64 English.
Server running Subversion 1.7.17 (Centos 6 x64)
svn protocol

Situation: unmodified branch working copy, merging "3rd party vendor
tree" changes into the branch through TSVN's "Merge a range of
revisions" operation, one r-version chosen, defaults on the merge
options (Working copy, only compare whitespaces checked) and there's
going to be bunch of files/folders modified/added/deleted and only
one conflict on a zip thus a binary file => TSVN's Resolve Conflict
dialog comes up.

Now if I choose "Prefer repository" the conflicted file is NOT going
to be the file on repository it will be the local version! Naturally
with the choose of "Prefer local" this will happen as well.

This can be repeated and e.g I can see with Windows Explorer that
there are 3 files correctly in the folder before pressing a button to resolve:
atlassian-bundled-plugins.zip
atlassian-bundled-plugins.zip.merge-left.r637
atlassian-bundled-plugins.zip.merge-right.r638

This errorneous behavior won't happen if I choose Resolve later and
e.g. from the same dialog jump to the conflicted one and choose
Resolve conflict with 'theirs'!

I tested on one virtual machine: Win7 x64 & TSVN 1.8.0 x64 => Error:
Invalid 'conflict_result' argument

Same virtual machine updated to use TSVN 1.8.1 x64 => same problem as
described above!

And I tested with another host WinXP x64 with TSVN 1.7.13 x64 =>
Prefer repository works correctly.

   - Panu

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-05-08 10:57:22 CEST

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