[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Selective merging of features from a development branch

From: Jean-Marc van Leerdam <j.m.van.leerdam_at_gmail.com>
Date: Thu, 26 Nov 2009 14:01:05 +0100

Hi,

2009/11/26 andy <andy_at_quarch.com>:
> Hi,
>
> I've got a bit confused, hope someone can help!
>
> I have a 'Trunk' branch that contains stable code at version 1.4
> I have a 'Dev' branch (committed) that contains a month of development
> work that adds several new features. The features were added in
> parallel, so there is no revision number that would include a complete
> feature A but none of feature B....
>

But have all commits been exclusively for either feature A or B? At
least at the per-file level?

If that is the case, you can cherry pick the feature A commits and
merge these into trunk.

Then at a later stage you can merge the remainder (which AFAIK will
take into account that some changes have already been merged by
examining the merge-info properties of the affected folder(s) and
file(s)).

-- 
Regards,
Jean-Marc
--
.       ___
.  @@  // \\      "De Chelonian Mobile"
. (_,\/ \_/ \     TortoiseSVN
.   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
.   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2424591
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-11-26 14:01:13 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.