On Fri, 17 Aug 2007, David Kastrup wrote: > > Now is there any chance to set up a git structure that will me allow > to let _git_ perform merges between the standalone dsp project and the > part that has started off as a copy of it in a subdirectory from > projects/great, so that I have a merge history in my git mirror? Yes. That's what git "submodule" support is all about. You could create that "dsp" project as its own git project, and then include it within the bigger project as a submodule. Then, that "dsp" thing is really a totally independent git project in its own right, with git support for just "tying" it into the superproject. A few words of caution: - while the low-level core submodule support has been around for a while now, the actual "porcelain" level helper stuff is new to 1.5.3 (which is unreleased, so you'd have to use the current git "master" branch, of course) - submodules are (very much by design) meant to be git projects in their own right, and kept separate. That very explicit separation means that you will *see* it as a separate project, and you may decide that it's not worth the extra setup/complexity if the "dsp" thing just isn't big enough or the merge complexity just isn't worth the effort. - not very many people use it. The msysgit people seem to be using it, and Andy Parkins has been using it for a while (and seems happy), but I think you basically end up having less documentation and somewhat less support for it (and it doesn't get the same kind of testing that the "basic" git behaviours get). Another alternative is to do what git has long done with "gitk": you can maintain a separate project and just merge it directly into another git project, and it works fine that way, but it gets impossible to merge back and forth between the two projects (you can only merge one way: make all the major changes in the "dsp" project, and then you can just merge it into the project that uses it (but if you fix things in the bigger project, you can't merge the fixes back, you'll have to export the fixes as patches and do them in the "dsp" tree). Linus - 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
