Re: Can you do this with GIT?

[Johannes Schindelin <Johannes.Schindelin@gmx.de>]

Hi,

On Fri, 27 Jul 2007, CPD wrote:

> I hope this is the right forum, it's all I could find. Sincere apologies 
> in advance if I in the wrong place.

You might be interested in http://git.or.cz: there is a lot of useful 
information to find; amongst others what is the right forum...

So yes, this is the right forum.

> I set up a source control system for the company around CVS, but GIT has
> some very attractive features and I'd like to migrate if it can do some
> other things that we need.
> 
> We produce variations based on a (mostly) common codebase. In CVS I set 
> up "environment" modules for each platform, then when you are working on 
> that platform, you simply check out the correct environment and build. 
> Only the needed code and tools are exposed in that environment (this is 
> important as clients must NOT see each other's code and most customers 
> have some customization). I do this by defining and renaming modules in 
> the CVSROOT modules file.

I would use branches for that.  A base branch with the common code, and 
the customisations in all the branches, which merge from the base branch.

If you have an interesting change in a custom branch, you can percolate 
that back into the base branch, by checking out that base branch and 
cherry-picking the commit you want to have.

Of course, you can automate this merging (or even rebasing, if you are 
interested in keeping your customisations nice and tidy) with a script.  
With a git alias even.

Hth,
Dscho