{"thread":{"id":"23563","subject":"use case, advices (SVN/GIT)","startedAt":"2010-04-22T12:14:01Z","lastAt":"2010-04-23T15:25:17Z","messageCount":2,"participants":["Mihamina Rakotomandimby","Ulrich Spörlein"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"140124","messageId":"20100422151401.2c47aa76@pbmiha.malagasy.com","threadId":"23563","inReplyTo":null,"subject":"use case, advices (SVN/GIT)","fromName":"Mihamina Rakotomandimby","fromEmail":"mihamina@gulfsat.mg","sentAt":"2010-04-22T12:14:01Z","receivedAt":"2010-04-22T12:14:01Z","isPatch":false,"sender":{"key":"mihamina@gulfsat.mg","avatar":null},"body":"Manao ahoana, Hello, Bonjour,\n\nWe'd rather use GIT.\nBut there is a project, that we regularily pull (Coova:\nhttp://coova.org/CoovaChilli/Developers) which is under SVN.\n\nI first \"svn export\" this project.\nI initiate a new GIT repository based on what I \"exported\".\nI make my changes, and commit them.\n\nI month (and several commits) later, I would like to sync with Coova\nSVN.\n\nIt's a one way \"pull\": I wont push my changes to their repository.\n\nWhat's your recommended way to handle this?\n\nMisaotra, Thanks, Merci.\n\n-- \n       Architecte Informatique chez Blueline/Gulfsat:\n    Administration Systeme, Recherche & Developpement\n                +261 34 29 155 34 / +261 33 11 207 36\n"},{"id":"140223","messageId":"20100423152517.GA92627@acme.spoerlein.net","threadId":"23563","inReplyTo":"20100422151401.2c47aa76@pbmiha.malagasy.com","subject":"Re: use case, advices (SVN/GIT)","fromName":"Ulrich Spörlein","fromEmail":"uqs@spoerlein.net","sentAt":"2010-04-23T15:25:17Z","receivedAt":"2010-04-23T15:25:17Z","isPatch":false,"sender":{"key":"uqs@spoerlein.net","avatar":null},"body":"On Thu, 22.04.2010 at 15:14:01 +0300, Mihamina Rakotomandimby wrote:\n> Manao ahoana, Hello, Bonjour,\n> \n> We'd rather use GIT.\n> But there is a project, that we regularily pull (Coova:\n> http://coova.org/CoovaChilli/Developers) which is under SVN.\n> \n> I first \"svn export\" this project.\n> I initiate a new GIT repository based on what I \"exported\".\n> I make my changes, and commit them.\n\nUse git-svn(1) to clone the branch you want to track\n\n$ git svn init -Ttrunk URL\n\nnow you have a master branch that is set up to track the svn trunk. I'd\nrecommend to put your commits into a different branch though and keep\n'master' clean.\n\n> I month (and several commits) later, I would like to sync with Coova\n> SVN.\n\n$ git svn rebase\nwill fetch all new svn commits and put them in remotes/trunk, master is\nthen forwarded accordingly.\n\nRebase your work on top of master now\n$ git rebase master mybranch\n\n> It's a one way \"pull\": I wont push my changes to their repository.\n> \n> What's your recommended way to handle this?\n\ngit-svn, see above.\n\nUli\n"}]}