[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: Thu, 15 Jan 2015 15:31:41 -0800 (PST)

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

Neither of those are a problem. Just specify specific revisions to be merged. (Although normally you'd want all 1.0-work to end up in trunk as well, so that 2.0 doesn't reintroduce bugs fixed in 1.0.)

Presumably at some point when there is only trunk existing, you are stating "ok, trunk is good now, I want to freeze everything for 1.0". You then immediately create 1.0-work from trunk and 1.0 from 1.0-work at that instant. Thereafter devs commit to either trunk or 1.0-work or both as needed, and you can cherry pick the commits from 1.0-work to 1.0 as they are approved.

The same process should work for 2.0. Also remember that when you create the stable branches you don't have to pick the current HEAD of trunk -- you can create it from the last revision you're fully happy with if you like, and then start cherry-picking further revisions from there.

Just remember to individually commit revisions merged from trunk to 2.0-work if you want to be able to individually merge them to 2.0 instead of as a bundle.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-01-16 00:31:50 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.