{"thread":{"id":"28420","subject":"git subtree merging with a SVN remote?","startedAt":"2011-09-18T14:44:33Z","lastAt":"2011-09-18T18:00:26Z","messageCount":2,"participants":["Manuel Reimer","Ronan Keryell"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"175721","messageId":"j550cl$218$1@dough.gmane.org","threadId":"28420","inReplyTo":null,"subject":"git subtree merging with a SVN remote?","fromName":"Manuel Reimer","fromEmail":"manuel.spam@nurfuerspam.de","sentAt":"2011-09-18T14:44:33Z","receivedAt":"2011-09-18T14:44:33Z","isPatch":false,"sender":{"key":"manuel.spam@nurfuerspam.de","avatar":null},"body":"Hello,\n\nI want to use \"subtree merging\" to get stuff from an external SVN repo into my \nproject.\n\nIs it possible to do this directly using the external SVN server or should I set \nup a GIT mirror of this SVN repo?\n\nIs this \"subtree merging\" a pure local thing or do I push some information about \nthis to the central GIT server?\n\nYours\n\nManuel\n"},{"id":"175725","messageId":"87ipop4tol.fsf@an-dro.info.enstb.org","threadId":"28420","inReplyTo":"j550cl$218$1@dough.gmane.org","subject":"Re: git subtree merging with a SVN remote?","fromName":"Ronan Keryell","fromEmail":"ronan.keryell@hpc-project.com","sentAt":"2011-09-18T18:00:26Z","receivedAt":"2011-09-18T18:00:26Z","isPatch":false,"sender":{"key":"ronan.keryell@hpc-project.com","avatar":null},"body":">>>>> On Sun, 18 Sep 2011 16:44:33 +0200, Manuel Reimer <Manuel.Spam@nurfuerspam.de> said:\n\n    Manuel> Hello, I want to use \"subtree merging\" to get stuff from an\n    Manuel> external SVN repo into my project.\n\n    Manuel> Is it possible to do this directly using the external SVN\n    Manuel> server or should I set up a GIT mirror of this SVN repo?\n\nI guess you can move *manually* the files from the SVN repository into\nthe git repository directly. :-)\n\nMore seriously, if you want to automate things, you have to go through a\ngit svn clone process.\n\n    Manuel> Is this \"subtree merging\" a pure local thing or do I push\n    Manuel> some information about this to the central GIT server?\n\nSince the concept of central git server is a pure convention, you can\nrely only on your local git repository only.\n\nFor a compiler project, I use these kinds of tricks to subtree 5\nupstream svn projects with the ability to apply on top of them some\nlocal commits, for example to avoid some upstream errors (it has just\nhappened last Friday :-( ).\n\nHaving all this operational is a little bit tedious, so I've developed\nscripts to have all the infrastructure running and easy to be updated.\n\nYou may read\nhttp://download.par4all.org/doc/organization/par4all_organization.htdoc/par4all_organization.html#x1-240007\nor the PDF version and look at the p4a_git command I use to run this process:\nhttps://git.hpc-project.com/cgit/par4all/tree/src/dev/p4a_git?h=p4a-own\nhttps://git.hpc-project.com/cgit/par4all/tree/src/dev/p4a_git_lib.bash?h=p4a-own\nand there are also some scripts around in the same directory to\nbootstrap the infrastructure.\n\nIf you want to look at the resulting project history, study the p4a\nbranch from the Par4All project.\n\nI've found this very powerful and efficient... once it is correctly\nset up. :-)\n\nI hope that helps,\n-- \n  Ronan KERYELL                      |\\/  Cell:   +33 613 143 766\n  HPC Project, Inc.                  |/)  Ronan.Keryell@hpc-project.com\n  5201 Great America Parkway #3241   K    skype:keryell\n  Santa Clara, CA 95054              |\\   http://hpc-project.com\n  USA                                | \\\n"}]}