From: "Christof Krüger" <git@christof-krueger.de>
To: Howard Miller <howard@e-learndesign.co.uk>
Cc: git@vger.kernel.org
Subject: Re: Merging some existing svn code
Date: Mon, 04 Jul 2011 18:00:02 +0200 [thread overview]
Message-ID: <1309795202.18226.3.camel@oxylap> (raw)
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
prev parent reply other threads:[~2011-07-04 16:00 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-04 12:59 Merging some existing svn code Howard Miller
2011-07-04 16:00 ` Christof Krüger [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1309795202.18226.3.camel@oxylap \
--to=git@christof-krueger.de \
--cc=git@vger.kernel.org \
--cc=howard@e-learndesign.co.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).