Hello, On Wed, Sep 23, 2009 at 09:04:33AM +0200, Arne Babenhauserheide wrote: > Am Dienstag, 22. September 2009 01:40:29 schrieb [email protected]: > > > 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.
Thank you for your suggestion :-) Although I think the problem is greatly simplified by the fact that we are going to flatten down the history of nsmux, so I guess I will manage such integration with git. Regards, scolobb
