Hi, On Mon, Jun 27, 2011 at 08:29:18PM -0400, Phil Hord wrote: > On 06/27/2011 03:34 PM, Fredrik Gustafsson wrote: > > My fourth task (and the main task of this summer) will start on June 27 and > > will be to move a submodules .git-dir into the super-projects .git-dir. > > Design of this is already done and approved by my mentors. > > This frightens me a bit, so I read the wiki link about it. Thanks for > explaining where I can find this information. I do not know what part of this change frightens you? > But I'm still confused. > > If I understand right, the submodule/.git dirs will be moved into the > top-level at .git/submodule/.git. The benefit is supposed to be that > this will free up contention on the non-empty submodule directory when > the super-project switches branches. > > In the simple case, git warns "unable to rmdir sub: Directory not > empty". But I can think of other conflicts as well. > > My question is, how does this proposed change help the situation? The proposed change allows us to implement that a submodules directory can be completely removed if it was deleted or moved. If we would do that currently you would loose all local history of the submodule. I do not know what you mean with "conflicts" but this change will help submodule towards behaving like they were ordinary directories in git. Cheers Heiko -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html