From: Ray Lehtiniemi <rayl@mail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: CPD <cdavidson@altsoftware.com>, git@vger.kernel.org
Subject: Re: Can you do this with GIT?
Date: Fri, 27 Jul 2007 14:08:06 -0600 [thread overview]
Message-ID: <200707271408.07108.rayl@mail.com> (raw)
In-Reply-To: <Pine.LNX.4.64.0707272048280.14781@racer.site>
On Friday 27 July 2007 13:49, Johannes Schindelin wrote:
> Hi,
>
> On Fri, 27 Jul 2007, Ray Lehtiniemi wrote:
> > On Friday 27 July 2007 13:05, Johannes Schindelin wrote:
> > > On Fri, 27 Jul 2007, CPD wrote:
> > > > 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.
> >
> > this would break down if there were client-specific modules in the base
> > branch, though... how could those be hidden from the other clients?
>
> Umm. Don't put the client-specific modules in the base branch, then? The
> base branch is the common code, the code that every client may look at.
> Nothing else.
yes, i don;t think there's any other way to do it with branches (and just be
careful not to merge the private branches back! :-)
> Maybe I did not get the whole picture... do you want your _clients_ to
> access your main repo with Git?
not in my case, anyway... although if you define "client" to
include "subcontractor", then yes, i'd be interested in going down that
road... sometimes there are pieces which they aren't licensed to see, but if
we could somehow track their work in a separate repo and then easily merge it
back into the fully licensed tree, that would have great value.
from the original message, i also keyed on "Only the needed code and tools are
exposed in that environment". this is something i'd like to see too... i'm
working in a software eco-system with hundreds of standalone components, and
would like the ability to pick and choose a small handful of those for any
given project, without pulling in reams of history on the stuff i'm not
using...
thanks
ray
>
> Ciao,
> Dscho
next prev parent reply other threads:[~2007-07-27 20:08 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-27 18:02 Can you do this with GIT? CPD
2007-07-27 19:05 ` Johannes Schindelin
2007-07-27 19:45 ` Ray Lehtiniemi
2007-07-27 19:49 ` Johannes Schindelin
2007-07-27 20:08 ` Ray Lehtiniemi [this message]
2007-07-27 19:45 ` Linus Torvalds
2007-07-27 19:52 ` Ray Lehtiniemi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200707271408.07108.rayl@mail.com \
--to=rayl@mail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=cdavidson@altsoftware.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).