Re: organizing multiple repositories with dependencies

From: Jens Lehmann <jens.lehmann@web.de>
Date: Apr 18, 2012, 12:09 UTC
Message-ID: <4F8EAEF4.8030706@web.de>
In-Reply-To: <CAE1pOi38krwXZuiYxtpLwm92N=NvWkP30V_=6cnHw=sdyk6QhA@mail.gmail.com>

Am 17.04.2012 23:43, schrieb Hilco Wijbenga:

> The main problem with the current submodule support is that there is
> so much manual work needed. It is too easy to forget a step. Moreover,
> it's not easy to determine *that* you forgot a step or which step you
> forgot.

Looks like you are talking about the submodule support how it was a few years ago. Since 1.7.0 you cannot forget to commit changes in the submodule anymore, and since 1.7.5 all referenced submodule commits are fetched when you fetch the superproject. The only thing missing (with some work done towards that in last years GSoc) is supporting the pushing of submodule changes and the transparent update of submodule content when the superproject is updated, both of which are currently being worked on.

What else was bothering you so much you dumped submodules?

Show 12 quoted lines

>> Of course, this is entirely driven by git-subtree's model of actually
>> incorporating subproject history into one big umbrella repository.
>> There is no separation between the subprojects and umbrella projects.
>> It's one giant history.  Therefore, push/pull to/from subprojects are
>> explicit operations.  That's probably not the best model for every
>> situation but I find it very nice.
> 
> I do not have enough (okay, any) experience with subtree to comment on
> that. The first part seems just what I want. I'm not sure about the
> explicit pushing/pulling part. That sounds too much like asking for
> the sort of problems that scared us away from submodules. Hopefully,
> I'm dead wrong. :-)

As I understand subtree the pushing and pulling of the subprojects is needed pretty much at the same points in time it is needed when using submodules (to share the subproject work between different superprojects via their upstream). The difference is you import all subproject changes into a single repo when using subtree, while they stay separate when using submodules (and additionally you have to record the updated subprojects in the superproject in an extra commit there). Submodules enforce the distinction between submodules and the superproject while subtree doesn't, which may or may not be just what you want ;-)