[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: Gavin Lambert <colnet_at_mirality.co.nz>
Date: Wed, 14 Jan 2015 13:54:21 -0800 (PST)

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.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-01-14 22:54:27 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.