Hi, Am Dienstag, 22. September 2009 01:40:29 schrieb olafbuddenha...@gmx.net: > > And the last question is about the integration itself: how exactly do > > I take my nsmux git repository and integrate it into the Hurd git > > repository? > > I've never done this myself, so I actually don't know for sure. I > believe that it should be possible to simply do a normal merge. The > tricky part is that after the merge the stuff needs to be in a > subdirectory, while in the original repository it was top-level; so > first it's necessary to move the code. Making the move part of the merge > commit itself (rather than an extra commit before the merge) might > require some magic...
If you want to, I can just move it to a subdir with hg-git using the convert extension. Moving files to a subdir is just a matter of specifying ". subdir" in a filemap (will result in a new repository in which you'll always have been working in the subdir - "There is no top-level code" ;) ), and then the code can simply be merged. Best wishes, Arne --- --- --- --- --- --- --- --- --- Unpolitisch sein heißt politisch sein, ohne es zu merken. - Arne (http://draketo.de) --- --- --- --- --- --- --- --- ---
signature.asc
Description: This is a digitally signed message part.
