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

RE: Re: MERGE: Command Line Results Different from TortoiseSVN Results

From: Gavin Lambert <colnet_at_mirality.co.nz>
Date: Mon, 19 Jan 2015 20:26:44 -0800 (PST)

On 17/01/2015 22:06, Stefan Küng quoth:
>> It's a long-standing bug that TSVN will not hide revisions from the
>> "natural history" of a branch (the revision that the branch was
>> created from, and its parents). It's likely that this is what you're
>> seeing, although there wasn't enough info in the screenshots to be
>> sure.
>> The natural history is correctly excluded from the actual merge
>> operation, however; this is just an issue with the log.
>> I'm not certain of this, but I believe this has been fixed in TSVN
>> 1.9, which is not yet released.
> It's been fixed for a long time, but not enabled by default. The reason
> for enabling it by default is that it is very expensive to find the
> copyfrom-revision, which is necessary to do that.
> You can enable the behavior in the settings dialog->Advanced page:
> set the value of LogFindCopyFrom to 'true'.

That doesn't actually work though (or at least not as expected). See discussion in http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3084736

It was confirmed not working in 1.6 through 1.8. I know some form of it was working in 1.3 but that might have been a "simpler" branch structure.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-01-20 05:26:50 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.