From: D. Stuart Freeman <stuart.freeman@et.gatech.edu>
Date: Tue, 08 Apr 2008 22:47:19 GMT
Subject: Re: Migrating svn to git with heavy use of externals
Message-ID: <47FBF5F7.1060105@et.gatech.edu>
In-Reply-To: <32541b130804081401n743f39c9o3f016da9dee2eb92@mail.gmail.com>

Avery Pennarun wrote:
> Anyway, in this case, what you need to know is that .git/config
> already contains your submodule information.  Sadly, .gitmodules is
> probably sitting somewhere on your original branch, so it probably
> doesn't exist.  You could remove the entry from .git/config by hand
> and use git-submodule-add again (thus putting it in both places), or
> copy the .gitmodules file from the original branch, or git-cherry-pick
> the commit where you added it.
> 
> You should *also* cd into the access subdir and checkout the right
> revision there; at that time, the next commit to the sakai repository
> will make sure the submodule reference is to the right place.
> 
> Phew, I hope that made things more clear instead of less clear. :)
> 
> Have fun,
> 
> Avery

OK, this makes a lot more sense now.  Thanks.

-- 
Stuart