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

Re: Question on branching the right way

From: Jody Shumaker <jody.shumaker_at_gmail.com>
Date: 2006-04-05 16:35:02 CEST

> That situation differs from mine in two ways:
> 1) I want to merge the trunk into the branch (main version --merge
> into-> custom version)
> 2) The described version of the above chapter assumes, that the branched
> out version exists only for a certain amount of time until the bugfix or
> feature testing is done. At that point the versions are merged and the
> branch ceases to exist.
> In my setting the branch will exist until the end of time (so to say).
> You can picture it this way, that the main version is a product version
> for every customer and the custom (branched) version has an additional
> feature, that has been implemented for only one single customer. All I
> want to accomplish is, that the parts of these versions, that are the
> same, stay in sync.
> Regards,
> Sascha

Have you considered not using branching for this but instead using a
define and ifdef's to seperate out the extra code for this feature?
Then either seperate projects or build scripts to toggle the define?
The situation you're describing I'm not sure really takes advantage of
branching. What do you gain from branching to make up for the hassle
of all the merging? I've always viewed branches as best used for
things that will either only be temporary and eventually synched back
up and then forgotten, or will be permanently out of sync and their
own entity.

- Jody

To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed Apr 5 16:35:26 2006

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