threads / discuss / 16774

How do I..?

Subject: How do I..?

## tl;dr

3 messages between Dec 17, 2008 and Dec 17, 2008.

replies: 2people: 3as markdown or json

Dylan Martin· Dec 17, 2008, 23:16 UTC · lore

Sorry if this is a dumb question. I've poked around the docs and tried the google searches I could think of, but I don't even know what kind of search terms one would use in trying to answer this.

I'm a sysadmin and I've got a big monolithic git repo of all my scripts, documents, etc... It used to be a CVS repo but I converted it to git a while ago. Before I switched to git, I played around with SVN a bit, and started a few tiny SVN repos for various scripts I was working on. So, I know have one git repo with %90 of my stuff and a handful of SVN repos. I'd like to be able to add the SVN repos as subdirectories inside my git repo. I've found lots of pages describing how to convert an SVN repo into a _new_ git repo, but I haven't found anything yet about importing the contents of an SVN repo as a subdirectory of an _existing_ git repo.

-Thanks! Dylan

Peter Harris· Dec 17, 2008, 23:44 UTC · re: Dylan Martin · lore

Re: How do I..?

On Wed, Dec 17, 2008 at 6:16 PM, Dylan Martin wrote:

Show 8 quoted lines

> Before I switched to git, I played around with SVN a bit, and started
> a few tiny SVN repos for various scripts I was working on.  So, I know
> have one git repo with %90 of my stuff and a handful of SVN repos.
> I'd like to be able to add the SVN repos as subdirectories inside my
> git repo.  I've found lots of pages describing how to convert an SVN
> repo into a _new_ git repo, but I haven't found anything yet about
> importing the contents of an SVN repo as a subdirectory of an
> _existing_ git repo.

You could convert each SVN repo into its own temporary git repo, then use the subtree merge strategy to combine the git trees: http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html

Peter Harris

Miklos Vajna· Dec 17, 2008, 23:49 UTC · re: Dylan Martin · lore

Re: How do I..?

On Wed, Dec 17, 2008 at 03:16:59PM -0800, Dylan Martin <dmartin@sccd.ctc.edu> wrote:

Show 15 quoted lines

> Sorry if this is a dumb question.  I've poked around the docs and
> tried the google searches I could think of, but I don't even know what
> kind of search terms one would use in trying to answer this.
> 
> I'm a sysadmin and I've got a big monolithic git repo of all my
> scripts, documents, etc...  It used to be a CVS repo but I converted
> it to git a while ago.
> Before I switched to git, I played around with SVN a bit, and started
> a few tiny SVN repos for various scripts I was working on.  So, I know
> have one git repo with %90 of my stuff and a handful of SVN repos.
> I'd like to be able to add the SVN repos as subdirectories inside my
> git repo.  I've found lots of pages describing how to convert an SVN
> repo into a _new_ git repo, but I haven't found anything yet about
> importing the contents of an SVN repo as a subdirectory of an
> _existing_ git repo.

I would convert each repo to git, then merge them using subtree merge. See Documentation/howto/using-merge-subtree.txt.