Merging some existing svn code

Howard Miller· Jul 4, 2011, 12:59 UTC · lore

Firstly I have an application "under" git.... years ago I wrote a plugin for the app (and by that I mean that it does not affect the main code in any way) and that used svn. I've cloned the svn repository using git svn so I have the history. I'd like to pull this into the main project by moving the history onto a new branch. There will be no merge issues but I'm unsure of the steps to take. The file structure is not the same as the svn repository only covered the required directory.

Any help appreciated.

Christof Krüger· Jul 4, 2011, 16:00 UTC · re: Howard Miller · lore

Re: Merging some existing svn code

On Mo, 2011-07-04 at 13:59 +0100, Howard Miller wrote:

Show 8 quoted lines

> Firstly I have an application "under" git....  years ago I wrote a
> plugin for the app (and by that I mean that it does not affect the
> main code in any way) and that used svn. I've cloned the svn
> repository using git svn so I have the history. I'd like to pull this
> into the main project by moving the history onto a new branch. There
> will be no merge issues but I'm unsure of the steps to take. The file
> structure is not the same as the svn repository only covered the
> required directory.

Sounds like a subtree merge could help you, see [1]. Just ask if there is anything in the description that doesn't work for you.

Regards,
  Chris

[1] http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html