From: Christof Krüger <git@christof-krueger.de>
Date: Mon, 04 Jul 2011 16:00:02 GMT
Subject: Re: Merging some existing svn code
Message-ID: <1309795202.18226.3.camel@oxylap>
In-Reply-To: <CAHVO_930ECHRYR7RsKGa61OtBhwyFA5Mt9NxpD6Ysq9jJBgk-g@mail.gmail.com>

On Mo, 2011-07-04 at 13:59 +0100, Howard Miller wrote:
> 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