Re: git subtree merging with a SVN remote?

[Ronan Keryell <Ronan.Keryell@hpc-project.com>]

>>>>> On Sun, 18 Sep 2011 16:44:33 +0200, Manuel Reimer <Manuel.Spam@nurfuerspam.de> said:

    Manuel> Hello, I want to use "subtree merging" to get stuff from an
    Manuel> external SVN repo into my project.

    Manuel> Is it possible to do this directly using the external SVN
    Manuel> server or should I set up a GIT mirror of this SVN repo?

I guess you can move *manually* the files from the SVN repository into
the git repository directly. :-)

More seriously, if you want to automate things, you have to go through a
git svn clone process.

    Manuel> Is this "subtree merging" a pure local thing or do I push
    Manuel> some information about this to the central GIT server?

Since the concept of central git server is a pure convention, you can
rely only on your local git repository only.

For a compiler project, I use these kinds of tricks to subtree 5
upstream svn projects with the ability to apply on top of them some
local commits, for example to avoid some upstream errors (it has just
happened last Friday :-( ).

Having all this operational is a little bit tedious, so I've developed
scripts to have all the infrastructure running and easy to be updated.

You may read
http://download.par4all.org/doc/organization/par4all_organization.htdoc/par4all_organization.html#x1-240007
or the PDF version and look at the p4a_git command I use to run this process:
https://git.hpc-project.com/cgit/par4all/tree/src/dev/p4a_git?h=p4a-own
https://git.hpc-project.com/cgit/par4all/tree/src/dev/p4a_git_lib.bash?h=p4a-own
and there are also some scripts around in the same directory to
bootstrap the infrastructure.

If you want to look at the resulting project history, study the p4a
branch from the Par4All project.

I've found this very powerful and efficient... once it is correctly
set up. :-)

I hope that helps,
-- 
  Ronan KERYELL                      |\/  Cell:   +33 613 143 766
  HPC Project, Inc.                  |/)  Ronan.Keryell@hpc-project.com
  5201 Great America Parkway #3241   K    skype:keryell
  Santa Clara, CA 95054              |\   http://hpc-project.com
  USA                                | \