Re: importing cvs logical modules

From: Geoff Russell <geoffrey.russell@gmail.com>
Date: May 25, 2006, 06:02 UTC
Message-ID: <93c3eada0605242302x24ca1272xd7bfc3a677b32845@mail.gmail.com>
In-Reply-To: <7vslmyzoit.fsf@assigned-by-dhcp.cox.net>

On 5/25/06, Junio C Hamano <junkio@cox.net> wrote:

Show 30 quoted lines

> "Geoff Russell" <geoffrey.russell@gmail.com> writes:
>
> > I'd like to make 1 git repository Progs with xxxx and yyyy as child trees.
> >
> >           Progs/.git
> >           Progs/xxxx
> >           Progs/yyyy
> >
> > Does this sound useful to anyone else, or is it already possible?
>
> I would do it like this:
>
>            Progs/.git
>            Progs/xxxx/.git
>            Progs/yyyy/.git
>
> I do not know what you have in Progs/ hierarchy -- if it is just
> scaffolding to house subdirectories and nothing else you may not
> even need Progs/.git repository.
>
> This is a very useful and handy structure, and you do not need
> any tool support once you have these as separate repositories.
> If you want a single distribution point, you can push from these
> separate repositories into separate branches of a single
> distribution point repository [*1*].
>
> One potential disadvantage is that you would not get revision
> linkage between these "modules", but not having tight linkage is
> the point of modular structure, so depending on your workflow it
> probably may not matter.

The tight linkage is absolutely essential.

When we tag the system, we want to tag everything (not individually tag all 300 programs) so that later we can to branch at that tag. Very few of our programs are self contained, they generally make heavy use of one or more libraries --- which must also be part of the tree. The full structure should end up looking like:

        Top/.git
        Libraries/libx
        Libraries/liby
        Libraries/boost
        Libraries/...
        Programs/xxx
        Programs/yyy
        Programs/...
        ...etc.

When we build a full system, we want to tag that point so we can know exactly what went into that build.

We used to do it the "other" way.

         cvsroot/xxx
         cvsroot/yyy
         cvsroot/liby
         cvsroot/libx
         etc

But then when we did a system build, someone always forgot to tag something. So we got cvs to build a build logical tree and then cvs was quite happy to tag the lot with one go and nothing got forgotten. So now we are trying to pull the lot into git as one big tree.

Cheers, Geoff.

Show 12 quoted lines

>
>
> [Footnote]
>
> *1* In fact, my git working area has the "master", "next" or
> "pu" branch checked out in /path/to/work/area/git (and the
> repository is in /path/to/work/area/git/.git directory), and I
> check out the "todo" branch in /path/to/work/area/git/Meta
> directory, with /path/to/work/area/git/Meta/.git directory as
> its repository.
>
>