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

Stitching together two split segments from svn

From
LHLiam Healy <lnp@healy.washington.dc.us>
Date
Jul 24, 2008, 23:33 UTC
Message-ID
<654935030807241633g763e622br4feb8b4e23ee64e2@mail.gmail.com>
Hi,
I have a project whose history is stored in two separate svn
repositories.  The first repository I kept privately during initial
development, the second started when I posted it publicly and does not
have the history of the first.  I am trying to reunite them under git.
 The development of the first was linear, so after using git svn, the
history looks like:
 a - b - ... - c - d = HEAD (old repository)
and the second has one branch "ffa":
(new repository)
 T - d - e - ... - f - g - h - ... - j   master
                      \
                       k - l - .... - m  ffa

Note that T is the "trunk" initial commit on the svn repo that has no files. The second commit d is identical to the HEAD of old, as verified by git diff. However, when I remote add these two into a single repository, they show up as two detached chains, with no connection between them. I thought git rebase would reconnect them. However, when I do that on each branch (master and ffa), I get the following:

 a - b - ... - c - d - e - ... - f - g - h - ... - j   master
                      \
                       e - ... -f - g - k - l - .... - m  ffa
instead of what I would like
 a - b - ... - c - d - e - ... - f - g - h - ... - j   master
                                     \
                                      k - l - .... - m  ffa

That is to say, those commits from the new repository that have a common history for the two branches are duplicated. The commits are listed separately and have different SHA IDs, but they are clearly the same commits (same comments, same svn version number). Is there any way to do what I want? Really, all I want to do is change the parent of "e" to be the HEAD of the old repository.

Thank you.
Liam
Next: Jakub Narebski
Message 1 of 4 in “Stitching together two split segments from svn”
  1. Liam HealyJul 24, 2008
  2. Jakub NarebskiJul 24, 2008
  3. Liam HealyJul 25, 2008
  4. Jakub NarebskiJul 25, 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.