[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

FW: can I checkout up to three branches into one workspace?

From: Mark Hanna
Subject: FW: can I checkout up to three branches into one workspace?
Date: Wed, 19 Jan 2005 10:35:53 -0000


Firstly thank you for your reply.

We don't ship src, but are currently in the situation where we have
numerous branches all with customer specific areas which are pulled into
the build.  The maintenance of these branches with fixes having to be
merged between several branches has become time consuming for our small
development team, so I've been tasked along with the chief architect to
come up with a sensible solution which can quickly improve things before
a new batch of customers comes on line.

One alternative I'm looking at is a method of checking out the build
combination (stable point + patches +customer files) into different
directories and using ant to script the compilation. Do think this is
reasonably easy to achieve or would you suggest something better ?


-----Original Message-----
From: Pierre Asselin [mailto:address@hidden 
Sent: 19 January 2005 01:47
To: address@hidden
Subject: Re: can I checkout up to three branches into one workspace?

Mark Hanna <address@hidden> wrote:

> We want to reconstruct our code base within one module that already
> exists. Currently we branch a copy of the entire src of the module
> a branch and develop it specifically for each customer but due to the
> increasing number of customers we want to change the way we work. 

Before we go any further, do you ship sources ?  If not, why can't
you have an integrated source tree supporting all variants and
select the customer variant at build time with conditional compilation
and similar tricks ?

> [ ... ]
> The idea is to keep a generic branch and at a validated point, branch
> off individual files onto customer specific branches (i.e. customer_A,
> customer_B, etc). This point will also be used to create a branch for
> fixes.  [ ... ]

Yeah, it can be done, but it's a lot of trouble.  I would look at
alternatives first.

pa at panix dot com
Info-cvs mailing list

reply via email to

[Prev in Thread] Current Thread [Next in Thread]