Re: Merging submodules
- From
H.Merijn Brand <h.m.brand@xs4all.nl>
- Date
- Aug 4, 2008, 13:57 UTC
- Message-ID
- <20080804155733.46fd3982@pc09.procura.nl>
- In-Reply-To
- <20080804134053.GK10151@machine.or.cz>
On Mon, 4 Aug 2008 15:40:53 +0200, Petr Baudis <pasky@suse.cz> wrote:
Show 10 quoted lines
> 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.
We already changed the approach for converting projects from SCCS to create a recursive repo from all SCCS repo's. And that *is* perfect.
Problem with the current join/merge is that there already have been commits to the git repo after the SCCS convert that I do not want to loose.
Show 12 quoted lines
> 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.
I'll have a look at this anyway.
-- H.Merijn Brand Amsterdam Perl Mongers http://amsterdam.pm.org/ using & porting perl 5.6.2, 5.8.x, 5.10.x, 5.11.x on HP-UX 10.20, 11.00, 11.11, 11.23, and 11.31, SuSE 10.1, 10.2, and 10.3, AIX 5.2, and Cygwin. http://mirrors.develooper.com/hpux/ http://www.test-smoke.org/ http://qa.perl.org http://www.goldmark.org/jeff/stupid-disclaimers/