Am 31.01.2011 15:06, schrieb Christoph Zwerschke: > Actually you can do the merge already in Mercurial if that is easier, > and the convert to Git. I'll check out hg-git and post a recipe until > tomorrow. We should do this carefully.
Ok, I have tried this out and it works very well. However, my original suggestion was misleading, you must do a "rebase", not a normal "merge". In fact you can do this upfront with Mercurial already. Here are the exact steps to integrate the tg-2_0 repository into the tg-dev repository: # clone the trunk: hg clone https://bitbucket.org/turbogears/tg-dev # pull the 2.0 branch, don't care that it's not related: hg pull -f https://bitbucket.org/turbogears/tg-2_0 # the first revision in the tg-2_0 branch is d59ccf4db182 # the closest revision to where it was split off is 29f8f6e842a5 # rebase the tg-2_0 branch onto that revision: hg rebase --source d59ccf4db182 --dest 29f8f6e842a5 --keepbranches # update the working directory to the trunk again: hg update default # add bookmarks as hints for hg-git to create these as branches: hg bookmark -r 2.0 branch-2.0 hg bookmark -r default master # convert the whole repository to git: hg gexport Now do a "gitk --all" and marvel :-) In a similar way you can proceed with tg-devtools and tg-docs. To enable the necessary Mercurial extensions, you must put this into your .hgrc or into the .hg/hgrc of the cloned repository: [extensions] rebase = hgext.bookmarks = hggit = [git] intree = true Let me know how this recipe works for you. -- Christoph -- You received this message because you are subscribed to the Google Groups "TurboGears Trunk" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/turbogears-trunk?hl=en.
