Re: Importing non-version controlled bits and pieces to Git

From: Peter Karlsson <peter@softwolves.pp.se>
Date: Jun 24, 2008, 06:46 UTC
Message-ID: <Pine.LNX.4.64.0806240742240.5039@ds9.cixit.se>
In-Reply-To: <20080624051204.GA1760@diana.vm.bytemark.co.uk>

Karl Hasselström:

> A bit too late now, but ...

Not really, I'm on to the next project to import :-)

> another thing you could have done is make a straight linear import à
> la import-tars, and then modified the parentage with grafts until it
> looked good; and then finally use filter-branch to make the grafts
> part of the "real" history.

Yeah, I was considering this approach, but then I was half-way designing the script in my head, plus that the import is so quick that it was easy enough to re-write the configuration file and re-import to try something else. I love that aspect of Git -- the preparing of the file to import takes longer than the actual git-fast-import call...

> The advantage of this approach is that you can edit the parentage
> almost interactively, which should be the best approach given that
> you have a small number of commits and have to guess their
> relationships.

"Almost" being the magic word :-) I achieved more or less the same by re-importing. Plus that the job of preparing tarballs of everything would have been some work as well, since I had to choose which files to import from each directory (and do CRLF transform).

-- 
\\// Peter - http://www.softwolves.pp.se/