[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 19:25:26 +0000


Below picture shows how we create the branches.
Branches/1.0 is created based on trunk and in this moment merges are done from trunk to 1.0 when revisions are approved.

When 2.0 starts, the branch 1.0-work is created based on trunk , but some revisions from trunk are not already merged to branches/1.0. So they will merge later from 1.0-work to 1.0.
When I do merge from 1.0-work to 1.0 using TSVN, I have to uncheck option stop on copy/renamed in order to see those revisions that were not merged yet to 1.0.
I can see those revisions and I do merge/commit them to 1.0
If I do merge again from 1.0-work to 1.0, I should not see them as to be merged since I did this in previous step, but they are shown as to be merged. This happens just with TSVN , command line has the correct behavior.


Best Regards

[WeDo Technologies]<http://www.wedotechnologies.com/>

Marcia Rocha –Tech Support Team
Tel. + 351 939650228

From: Ben Fritz [mailto:fritzophrenic_at_gmail.com]
Sent: 15 de janeiro de 2015 16:10
To: users_at_tortoisesvn.tigris.org
Subject: Re: MERGE: Command Line Results Different from TortoiseSVN Results

On Thu, Jan 15, 2015 at 3:53 AM, Marcia Almeida Rocha <Marcia.Rocha_at_wedotechnologies.com<mailto:Marcia.Rocha_at_wedotechnologies.com>> wrote:
> 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.

I think Gavin meant, "previous in the revision graph" not "previous in time".

Do these branches not share any ancestry, somehow? How did you create your branch?


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

Received on 2015-01-15 20:25:45 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.