[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: Thu, 15 Jan 2015 09:53:26 +0000

Hello Gavin

The results are not the same, because TSVN shows revision 610 as not merged. You're right , this revision is previous than branch creation, but when branch was created, the revision 610 was not merged yet. In that moment, command line has listed it as not merged and TSVN too. After, I've merged revision 610 and the command line does not show it, but TSVN shows it.

We have a model that for each version, we have 2 branches (work and stable) . Only approved revisions are merged to stable branch correspondent to that version. Trunk is the work branch from last version. Sometimes, we need a new version, even when neither all revisions from trunk are merged to stable branch. In this moment, we create a new branch X.Y-work based on trunk and this X.Y-work branch has revisions that are not merged yet to its stable branch (revisions existent previously the X.Y-work branch creation). When these revisions are not merged yet,TSVN shows correctly these revisions, but when I merge these revisions, TSVN keeps showing them as not merged yet when they are already merged.
So, just command line has the correct information in this moment.

Best Regards

Marcia Rocha –Tech Support Team
Tel. + 351 939650228

-----Original Message-----
From: Gavin Lambert [mailto:colnet_at_mirality.co.nz]
Sent: 14 de janeiro de 2015 21:54
To: users_at_tortoisesvn.tigris.org
Subject: RE: MERGE: Command Line Results Different from TortoiseSVN Results

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


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-01-15 10:53:35 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.