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

How do I manage this setup with git-svn and/or git remotes?

From
David Kastrup <dak@gnu.org>
Date
Aug 17, 2007, 17:24 UTC
Message-ID
<86y7gaxef5.fsf@lola.quinscape.zz>
I have a Subversion repository which contains the following:

https://repo.here/svn/dsp/{trunk,tags,branches} and https://repo.here/svn/projects/great/{trunk/tags/branches}

I have those currently checked out into separate git repositories. However,

https://repo.here/svn/projects/great/{trunk/tags/branches}

contain a subdirectory dsp that has been copied via Subversion from the main dsp trunk. Subsequently this copy and the original dsp have progressed.

Now is there any chance to set up a git structure that will me allow to let _git_ perform merges between the standalone dsp project and the part that has started off as a copy of it in a subdirectory from projects/great, so that I have a merge history in my git mirror?

Or is basically the only thing I can do to create selective patches and apply them, thus not tracking the merges?

-- 
David Kastrup
Next: Linus Torvalds
Message 1 of 10 in “How do I manage this setup with git-svn and/or git remotes?”
  1. David KastrupAug 17, 2007
  2. Linus TorvaldsAug 17, 2007
  3. David KastrupAug 17, 2007
  4. Linus TorvaldsAug 17, 2007
  5. David KastrupAug 17, 2007
  6. Junio C HamanoAug 17, 2007
  7. David KastrupAug 17, 2007
  8. David KastrupAug 18, 2007
  9. Jakub NarebskiAug 18, 2007
  10. David KastrupAug 19, 2007

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.