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

RE: MERGE: Command Line Results Different from TortoiseSVN Results

From: Marcia Almeida Rocha <Marcia.Rocha_at_wedotechnologies.com>
Date: Mon, 19 Jan 2015 10:57:45 +0000


I've done this change and I've reboot my PC, but the problem has kept:


Example: below revisions 318 and 334 had already merged, but they are being shown as eligible to be merged.


Command line:
$ svn mergeinfo --show-revs eligible http://svn:82/repos/BPM/branches/3.9-work http://svn:82/repos/BPM/branches/3.9

Best Regards

Marcia Rocha –Tech Support Team

Tel. + 351 939650228



-----Original Message-----
From: Stefan Küng [mailto:tortoisesvn_at_gmail.com]
Sent: 17 de janeiro de 2015 09:07
To: users_at_tortoisesvn.tigris.org
Subject: Re: MERGE: Command Line Results Different from TortoiseSVN Results

On 14.01.2015 22:54, Gavin Lambert wrote:

> On 15/01/2015 06:03, Marcia Almeida Rocha quoth:

>> I’m using : TortoiseSVN 1.8.8, Build 25755 - 64 Bit , 2014/08/10

>> 14:44:06


>> I think it is a TortoiseSVN bug because the behavior is different

>> from command line.


>> If I use command line to list the revisions eligible to be merged

>> I’ve received a result X.


> It looks like those results are the same, except that TSVN also lists

> revisions 1 and 610.


> 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'.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2015-01-19 11:57:59 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.