On Tue, 2008-09-02 at 02:31 +0200, Jakub Narebski wrote: > On Mon, 1 Sep 2008, Magnus Hjorth wrote: > > On Sun, 2008-08-31 at 04:12 -0700, Jakub Narebski wrote: > > > Magnus Hjorth <magnus.hjorth@xxxxxxx> writes: > > > > > > > > > > I'm trying to port over old version history that I maintained manually > > > > (tarballs and changelogs) into a git repository. > > > > > > For that, I think it would be best to take a look at example > > > fast-import script: contrib/fast-import/import-tars.perl; > > > there is equivalent contrib/fast-import/import-zips.py if you > > > perfer either Pyhon over Perl, and/or zips over tarballs. > By the way, is there any reason _not_ to use import-tars.perl from > the contrib/fast-import in your case? Well, I was planning do a lot of manual cleanup of the files also (splitting commits, removing auto-generated files etc), so importing the tarballs would just be the first step. But I'll try it, it can still be useful to get a starting point... > > > > I have successfully imported the CVS history using git-cvsimport, but > > now I want to add these older revisions that were made with tarballs to > > the same tree, before the CVS revisions. The last tarball and the first > > CVS revision have identical content, and I would like to somehow "glue" > > the histories together. > > > > Can this be done? > > It can be done for example using grafts. Search git mailing list for > graftshistory (or something like that) script, which was used to join > using grafts git "current work" Linux repository (started from "scratch"). > Then you can check in gitk if everything is all right. If you truly > require connected histories, and not being able to locally turn on > and off the historical repository, you can always use git-filter-branch > which (among others) can turn grafts into true commits. The grafts approach looks interesting. I still need some way to create multiple unconnected trees in one repo. Maybe the safest way to do that is to create a separate historic repo first and then transfer the historic branch using git-bundle to my main working repo. Regards, Magnus -- 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
