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

BUG: Old style merge seems to be always used

From: Shiraz Esat <shiraz.esat+dev_at_gmail.com>
Date: Wed, 18 Mar 2015 10:14:16 -0700 (PDT)

When attempting to perform a merge from a Branch to Trunk I have the attached settings.

If I click Test merge, the merge successfully completes.
If I click on the Merge button the error shown suggests that a ‘reintegrate’ merge was attempted.
That is, the error shown is identical to the error that would be shown if I had “Do integrate instead of automatic merge (old style)” and then clicked Test merge.

So, it appears that “Do integrate instead of automatic merge (old style)” is always assumed regardless of its checked state when clicking Merge.

Version Info:
TortoiseSVN 1.8.10, Build 26129 - 64 Bit , 2014/12/17 19:35:51
Subversion 1.8.11, -release
apr 1.5.1
apr-util 1.5.4
serf 1.3.8
OpenSSL 1.0.1j 15 Oct 2014
zlib 1.2.8

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

MergeIssue.jpg
Received on 2015-03-18 19:38:18 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.