From: Benoit SIGOURE <tsuna@lrde.epita.fr>
Date: Tue, 09 Oct 2007 07:19:28 GMT
Subject: Re: Recording merges after repo conversion
Message-ID: <13D1D3DD-9652-4097-8364-DEF4F26540D3@lrde.epita.fr>
In-Reply-To: <Pine.LNX.4.64.0710090807060.26773@ds9.cixit.se>

On Oct 9, 2007, at 9:09 AM, Peter Karlsson wrote:

> Hi!
>
> I have a couple of repositories converted from CVS to Git using
> parsecvs. Some are just converted, some I've continued to develop  
> after
> the conversion (and cloned a couple of times).
>
> Since parsecvs gave me all the CVS branches, I would like to record  
> the
> merge points in the Git history, if possible. I have commited merges
> with comments like "merged <branchname>", so I can probably find them
> quite easily, and I do have the imported CVS branches available. Can I
> record the merge information so git knows about them?
>
> Is it safe to do so on a repository that has already been cloned (i.e,
> will a later push/pull work)?

I think you can use grafts do achieve this.

 From Documentation/repository-layout.txt:
info/grafts::
         This file records fake commit ancestry information, to
         pretend the set of parents a commit has is different
         from how the commit was actually created.  One record
         per line describes a commit and its fake parents by
         listing their 40-byte hexadecimal object names separated
         by a space and terminated by a newline.

Cheers,

-- 
Benoit Sigoure aka Tsuna
EPITA Research and Development Laboratory