Re: Big Mess--How to use Git to resolve

From: Seth Robertson <in-gitvger@baka.org>
Date: Dec 21, 2011, 23:56 UTC
Message-ID: <201112212356.pBLNuApC009997@no.baka.org>
In-Reply-To: <4EF26F7B.90206@gmail.com>

In message <4EF26F7B.90206@gmail.com>, Neal Kreitzinger writes:

    We are working on implementing this so some of what I said is 
    theoretical.  Custom branches in combination with submodules seems like 
    it could get pretty unwieldy if not managed properly.

You might want to consider using gitslave (http://gitslave.sf.net) which is easier to use when you are developing both the superproject and the subprojects at the same time. You don't have to use the "mother-may-I" commit protocol.

The trick with gitslave is that normally you run all git commands on all repositories at the same time. So all repositories which are part of the superproject will be on the same branch. This sounds like it is ideal for you.

However, you do lose the strong binding between the superproject commit and the subproject commit, so you would want to tag all projects (trivial when using gitslave) when you go through a release so that you can later go back and check out synchronized repositories for a particular release.

					-Seth Robertson