git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Stitching together private svn repo and public git repo

From
Dmitry Potapov <dpotapov@gmail.com>
Date
Jan 2, 2008, 22:13 UTC
Message-ID
<37fcd2780801021413g5f2a602dkb9fc289a13517375@mail.gmail.com>
In-Reply-To
<20080102214005.GA10924@hashpling.org>
On Jan 3, 2008 12:40 AM, Charles Bailey <charles@hashpling.org> wrote:
> You could then do this with a 'git filter-branch --parent-filter' to
> rewrite the parents of the merge commits.  As far as I can see, you
> would need to call filter-branch once per merge to rewrite everything
> from the merge commit forwards.

I believe there is a much easier way to do that using .git/info/grafts The first step is to create .git/info/grafts, which specifies commit-id and its parents for each commit that you want to change. Then you can check the result using gitk, and if you are satisfied with what you see then you run git filter-branch on it to convert 'fake' parents into real ones.

Dmitry
Previous: Charles BaileyNext: Charles Bailey
Message 3 of 6 in “Stitching together private svn repo and public git repo”
  1. Gregory JefferisJan 2, 2008
  2. Charles BaileyJan 2, 2008
  3. Dmitry PotapovJan 2, 2008
  4. Charles BaileyJan 2, 2008
  5. Gregory JefferisJan 3, 2008
  6. Junio C HamanoJan 3, 2008

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.