* Merging some existing svn code
@ 2011-07-04 12:59 Howard Miller
2011-07-04 16:00 ` Christof Krüger
0 siblings, 1 reply; 2+ messages in thread
From: Howard Miller @ 2011-07-04 12:59 UTC (permalink / raw)
To: git
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Merging some existing svn code
2011-07-04 12:59 Merging some existing svn code Howard Miller
@ 2011-07-04 16:00 ` Christof Krüger
0 siblings, 0 replies; 2+ messages in thread
From: Christof Krüger @ 2011-07-04 16:00 UTC (permalink / raw)
To: Howard Miller; +Cc: git
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-07-04 16:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-04 12:59 Merging some existing svn code Howard Miller
2011-07-04 16:00 ` Christof Krüger
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).