[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 23:09:27 +0000

Thanks Gavin, but I cannot implement your suggestion, because the branch 1.0 correspond just the revisions approved from 1.0-work , so sometimes they have to do commit under 1.0-work but not all are approved to merge to 1.0, and I cannot create 1.0 based on 1.0-work.

The another suggestion to merge from 1.0-work to trunk and trunk to 1.0, it is not applicable too, because when I have 1.0-work, it means that trunk is the "work" branch for the new version (2.0 for example), so changes from trunk cannot be merged to 1.0 but just to 2.0, since trunk has in that moment changes to the new version.

I can change my model and remove trunk idea, and we can create branches/1.0-work and branches/1.0 at the begin, where 1.0 based on 1.0-work empty.
The problem will be when starts the new version 2.0 and the 1.0 has not concluded yet. In this moment I can create 2.0-work based on 1.0-work, but the branch 2.0 cannot be created based on 2.0-work, because all 2.0-work was not approved yet to be included in branches/2.0. You can say that I should create branches/2.0 just when all 2.0-work revisions are approved, but this is not the way the developers work, they want to include many changes at X.Y-work branch and they want to have a X.Y stable branch with just some revisions from X.Y-work in some moment. During development/test phase its difficult to have all changes approved from X.Y-work to be included in stable branch X.Y. Only when we have a final release, all revisions from X.Y-work branch is approved and are included at X.Y branch :(.

But, I would like to understand why I can have my answers from command line but I cannot from TSVN?

Thanks a lot

Best Regards

Marcia Rocha -Tech Support Team
Tel. + 351 939650228

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

On 16/01/2015 08:25, Marcia Almeida Rocha quoth:
> 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.

In general, it is not a good idea to merge unrelated/sibling branches. You *can* do it if you're careful, and they do get tracked, but it creates quite a mess.

You should try to always merge between parent & child branches only, never to siblings or grandparents/children.

So with the above layout, never merge between 1.0-work and 1.0 -- merge 1.0-work to trunk and then trunk to 1.0.

Alternatively, you should change your practices such that you create 1.0-work from trunk and then 1.0 from 1.0-work. Then the merges will flow more naturally.


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-16 00:09:46 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.