{"thread":{"id":"27751","subject":"Merging some existing svn code","startedAt":"2011-07-04T12:59:34Z","lastAt":"2011-07-04T16:00:02Z","messageCount":2,"participants":["Howard Miller","Christof Krüger"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"170815","messageId":"CAHVO_930ECHRYR7RsKGa61OtBhwyFA5Mt9NxpD6Ysq9jJBgk-g@mail.gmail.com","threadId":"27751","inReplyTo":null,"subject":"Merging some existing svn code","fromName":"Howard Miller","fromEmail":"howard@e-learndesign.co.uk","sentAt":"2011-07-04T12:59:34Z","receivedAt":"2011-07-04T12:59:34Z","isPatch":false,"sender":{"key":"howard@e-learndesign.co.uk","avatar":"https://gravatar.com/avatar/ddb66c6a4a077e52b823ac5b04f33ab927cb90e2ab1eafedaeba07b1920bb99e?d=mp&s=160"},"body":"Firstly I have an application \"under\" git....  years ago I wrote a\nplugin for the app (and by that I mean that it does not affect the\nmain code in any way) and that used svn. I've cloned the svn\nrepository using git svn so I have the history. I'd like to pull this\ninto the main project by moving the history onto a new branch. There\nwill be no merge issues but I'm unsure of the steps to take. The file\nstructure is not the same as the svn repository only covered the\nrequired directory.\n\nAny help appreciated.\n"},{"id":"170820","messageId":"1309795202.18226.3.camel@oxylap","threadId":"27751","inReplyTo":"CAHVO_930ECHRYR7RsKGa61OtBhwyFA5Mt9NxpD6Ysq9jJBgk-g@mail.gmail.com","subject":"Re: Merging some existing svn code","fromName":"Christof Krüger","fromEmail":"git@christof-krueger.de","sentAt":"2011-07-04T16:00:02Z","receivedAt":"2011-07-04T16:00:02Z","isPatch":false,"sender":{"key":"git@christof-krueger.de","avatar":null},"body":"On Mo, 2011-07-04 at 13:59 +0100, Howard Miller wrote:\n> Firstly I have an application \"under\" git....  years ago I wrote a\n> plugin for the app (and by that I mean that it does not affect the\n> main code in any way) and that used svn. I've cloned the svn\n> repository using git svn so I have the history. I'd like to pull this\n> into the main project by moving the history onto a new branch. There\n> will be no merge issues but I'm unsure of the steps to take. The file\n> structure is not the same as the svn repository only covered the\n> required directory.\nSounds like a subtree merge could help you, see [1].\nJust ask if there is anything in the description that doesn't work for\nyou.\n\nRegards,\n  Chris\n\n[1]\nhttp://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html\n"}]}