On Wednesday, May 14, 2014 8:15:25 AM UTC+2, Thomas Ferris Nicolaisen wrote:
> On Wednesday, May 14, 2014 7:27:53 AM UTC+2, Moataz Elmasry wrote:
>> Hi Thomas and thanks for your reply
>> Why should I slice the main project? it is good the way it is. I need to 
>> append to it from the back ,i.e. earlier commits and the final state should 
>> be the main project including the commits from the time it was multiple 
>> modules/multiple trunks
> Ah, I incorrectly assumed that you wished to split into more fine grained 
> repositories again.
> It could still be that this is still the best approach to get a *correct* 
> history for each sub-project. After you've got them all grafted properly 
> and you want to bring them together in one repository again, you could use 
> something like 
> git-stitch-repo<http://search.cpan.org/dist/Git-FastExport/script/git-stitch-repo>
> .
> If you don't care that much about correctness, you could just graft the 
> first commit in the mainProject repo into being a merge-commit of all the 
> last commits in the old subprojects:
> last commit in subrepo1__
> last commit in subrepo2_ \
>                         \ |
>                           >> first commit in mainRepo (4 parents)
> last commit in subrepo3_/ |
> last commit in subrepo4__/
> In this case, it will look like all the files from the subprojects are 
> moved into their respective folders in the first commit in mainRepo. 

Aha that would be exactly what I'm looking for, how can one define the 
first commit in mainrepo as a merge commit of several repositories. Only 
using graft point with one child and several parents does not allow me to 
follow a file history from main project through the older projects

thanks for the stich-repo script, I'll check it out when I'm home


You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to