Re: Partial checkouts / submodules

From: Sven Verdoolaege <skimo@kotnet.org>
Date: Nov 20, 2007, 18:42 UTC
Message-ID: <20071120184227.GB2261MdfPADPa@greensroom.kotnet.org>
In-Reply-To: <20071120181932.GA20705@pvv.org>

On Tue, Nov 20, 2007 at 07:19:33PM +0100, Finn Arne Gangstad wrote:

Show 16 quoted lines

> On Tue, Nov 20, 2007 at 06:33:50PM +0100, Sven Verdoolaege wrote:
> 
> > Just "submodule init" and "submodule update" these submodules and
> > it looks like you would get what you want...
> > 
> > > If I make a branch on submodule71, the branch is made in all submodules &
> > > the supermodule.
> > 
> > ... except this one.
> > It's not clear why you would even want this.
> 
> I'll try to boil this down to the simplest case possible. If
> submodules can do this I'll be really happy :)
> 
> Developer A makes a change in submodule1 and in submodule2
> Developer B makes a change in submodule2 and in submodule3

I'm assuming that A and B also make a commit to the supermodule incorporating their changes to the submodules (as in your original message).

> A and B don't know about eachother. They send their modifications
> somewhere (push to a shared repository with a well chosen branch name,
> for example), or send a mail "please pull from my repo" to the patch
> queue manager.

The commit A made to the superproject contains his changes to the submodule, so if someone pulls this superproject commit, she'll get the submodule changes too. (Although she may choose not to have some or all of these submodules checked out.)

Show 5 quoted lines

> Also - it would be very good if the history in the master repo would
> match the history in all developers' repositories (as the
> modifications are merged in by the patch queue manager). I.e. - you
> should see a "gif support" feature branch, see the commits on it, and
> finally the merge.

You can't change the history in git. [*1]

It's still not clear why you would want new branches to be created in other modules when you create a new branch in some module.

skimo

[*1] There are tools that allow you to create a new history based on an old history, but it will be a different history.