{"thread":{"id":"16774","subject":"How do I..?","startedAt":"2008-12-17T23:16:59Z","lastAt":"2008-12-17T23:49:27Z","messageCount":3,"participants":["Dylan Martin","Peter Harris","Miklos Vajna"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"98202","messageId":"e1a4c7f60812171516h7b7bb1fem35dfc6f30747a740@mail.gmail.com","threadId":"16774","inReplyTo":null,"subject":"How do I..?","fromName":"Dylan Martin","fromEmail":"dmartin@sccd.ctc.edu","sentAt":"2008-12-17T23:16:59Z","receivedAt":"2008-12-17T23:16:59Z","isPatch":false,"sender":{"key":"dmartin@sccd.ctc.edu","avatar":null},"body":"Sorry if this is a dumb question.  I've poked around the docs and\ntried the google searches I could think of, but I don't even know what\nkind of search terms one would use in trying to answer this.\n\nI'm a sysadmin and I've got a big monolithic git repo of all my\nscripts, documents, etc...  It used to be a CVS repo but I converted\nit to git a while ago.\nBefore I switched to git, I played around with SVN a bit, and started\na few tiny SVN repos for various scripts I was working on.  So, I know\nhave one git repo with %90 of my stuff and a handful of SVN repos.\nI'd like to be able to add the SVN repos as subdirectories inside my\ngit repo.  I've found lots of pages describing how to convert an SVN\nrepo into a _new_ git repo, but I haven't found anything yet about\nimporting the contents of an SVN repo as a subdirectory of an\n_existing_ git repo.\n\n-Thanks!\nDylan\n"},{"id":"98205","messageId":"eaa105840812171544i53e8a751s70ad495bb6a86160@mail.gmail.com","threadId":"16774","inReplyTo":"e1a4c7f60812171516h7b7bb1fem35dfc6f30747a740@mail.gmail.com","subject":"Re: How do I..?","fromName":"Peter Harris","fromEmail":"git@peter.is-a-geek.org","sentAt":"2008-12-17T23:44:41Z","receivedAt":"2008-12-17T23:44:41Z","isPatch":false,"sender":{"key":"git@peter.is-a-geek.org","avatar":null},"body":"On Wed, Dec 17, 2008 at 6:16 PM, Dylan Martin wrote:\n> Before I switched to git, I played around with SVN a bit, and started\n> a few tiny SVN repos for various scripts I was working on.  So, I know\n> have one git repo with %90 of my stuff and a handful of SVN repos.\n> I'd like to be able to add the SVN repos as subdirectories inside my\n> git repo.  I've found lots of pages describing how to convert an SVN\n> repo into a _new_ git repo, but I haven't found anything yet about\n> importing the contents of an SVN repo as a subdirectory of an\n> _existing_ git repo.\n\nYou could convert each SVN repo into its own temporary git repo, then\nuse the subtree merge strategy to combine the git trees:\nhttp://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html\n\nPeter Harris\n"},{"id":"98206","messageId":"20081217234927.GM5691@genesis.frugalware.org","threadId":"16774","inReplyTo":"e1a4c7f60812171516h7b7bb1fem35dfc6f30747a740@mail.gmail.com","subject":"Re: How do I..?","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-12-17T23:49:27Z","receivedAt":"2008-12-17T23:49:27Z","isPatch":false,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Wed, Dec 17, 2008 at 03:16:59PM -0800, Dylan Martin <dmartin@sccd.ctc.edu> wrote:\n> Sorry if this is a dumb question.  I've poked around the docs and\n> tried the google searches I could think of, but I don't even know what\n> kind of search terms one would use in trying to answer this.\n> \n> I'm a sysadmin and I've got a big monolithic git repo of all my\n> scripts, documents, etc...  It used to be a CVS repo but I converted\n> it to git a while ago.\n> Before I switched to git, I played around with SVN a bit, and started\n> a few tiny SVN repos for various scripts I was working on.  So, I know\n> have one git repo with %90 of my stuff and a handful of SVN repos.\n> I'd like to be able to add the SVN repos as subdirectories inside my\n> git repo.  I've found lots of pages describing how to convert an SVN\n> repo into a _new_ git repo, but I haven't found anything yet about\n> importing the contents of an SVN repo as a subdirectory of an\n> _existing_ git repo.\n\nI would convert each repo to git, then merge them using subtree merge.\nSee Documentation/howto/using-merge-subtree.txt.\n"}]}