Re: Merging submodules

From: Petr Baudis <pasky@suse.cz>
Date: Aug 4, 2008, 13:40 UTC
Message-ID: <20080804134053.GK10151@machine.or.cz>
In-Reply-To: <20080804152443.4418b3e0@pc09.procura.nl>

On Mon, Aug 04, 2008 at 03:24:43PM +0200, H.Merijn Brand wrote:

> I do have to work with the repo, and that is more important than having
> a perfect repo.

You might consider adopting a (relatively?) common strategy when importing historical projects: Actually start the history from scratch (git init && git add . && git commit -m"Initial commit") and fine-tune your historical import in a separate repository. Then, provide a script that people interested in the old history can run and it will graft the imported history to your pure-git history.

Conceptually, it should be pretty simple:

	git fetch git://perl-company.nl/sccs-import.git
	echo initial_git_commit_sha1 last_imported_commit_sha1 \
		>>$(git rev-parse --git-dir)/info/grafts

Example of a fine-tuned script:

	http://repo.or.cz/w/elinks.git?a=blob;f=contrib/grafthistory.sh

If you find out that the import is not perfect later on, you can just redo it, refetch and rewrite the info/grafts line.

-- 
				Petr "Pasky" Baudis
The next generation of interesting software will be done
on the Macintosh, not the IBM PC.  -- Bill Gates