{"thread":{"id":"24060","subject":"Git and svn as target","startedAt":"2010-06-10T05:45:15Z","lastAt":"2010-06-14T16:35:44Z","messageCount":4,"participants":["Matthias Fechner","Peter Baumann","Avery Pennarun"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"143391","messageId":"4C107BEB.6020209@fechner.net","threadId":"24060","inReplyTo":null,"subject":"Git and svn as target","fromName":"Matthias Fechner","fromEmail":"idefix@fechner.net","sentAt":"2010-06-10T05:45:15Z","receivedAt":"2010-06-10T05:45:15Z","isPatch":false,"sender":{"key":"idefix@fechner.net","avatar":"https://gravatar.com/avatar/3bbc5542677a77cb9b75262e4ad2eeb04a0960f0b8dec89a178db17cf472cce7?d=mp&s=160"},"body":"Hi,\n\ni started now to work with git instead of svn. The main repository is a \nsvn repo so i use git svn ...\n\nBut I have the problem now, commit comments are not transfered to svn, \nmaybe I miss here a parameter.\n\nWhat i did:\ngit svn fetch\ngit svn rebase\ngit branch test\ngit checkout test\nseveral commits\ngit checkout master\ngit svn fetch\ngit svn rebase\ngit merge test\ngit svn dcommit\n\nIn the commit of svn I see only merged test...\nCould I say git to put all the commit comments into the merge?\n\nGruss,\nMatthias\n\n-- \n\"Programming today is a race between software engineers striving to build bigger and better idiot-proof programs, and the universe trying to produce bigger and better idiots. So far, the universe is winning.\" -- Rich Cook\n"},{"id":"143392","messageId":"20100610060525.GA2177@m62s10.vlinux.de","threadId":"24060","inReplyTo":"4C107BEB.6020209@fechner.net","subject":"Re: Git and svn as target","fromName":"Peter Baumann","fromEmail":"waste.manager@gmx.de","sentAt":"2010-06-10T06:05:25Z","receivedAt":"2010-06-10T06:05:25Z","isPatch":false,"sender":{"key":"waste.manager@gmx.de","avatar":null},"body":"On Thu, Jun 10, 2010 at 07:45:15AM +0200, Matthias Fechner wrote:\n> Hi,\n> \n> i started now to work with git instead of svn. The main repository\n> is a svn repo so i use git svn ...\n> \n> But I have the problem now, commit comments are not transfered to\n> svn, maybe I miss here a parameter.\n> \n> What i did:\n> git svn fetch\n> git svn rebase\n> git branch test\n> git checkout test\n> several commits\n> git checkout master\n> git svn fetch\n> git svn rebase\n> git merge test\n> git svn dcommit\n> \n> In the commit of svn I see only merged test...\n> Could I say git to put all the commit comments into the merge?\n> \n\nAFAIK git svn doesn't handle git merges very well. If you rebase your test branch onto\nmaster and then do the git-svn dcommit, everything should work as expected.\n\n-Peter\n"},{"id":"143394","messageId":"AANLkTino5sVtNEFV5_nGi9NmlhBCc0-_4NhTZwKdDzho@mail.gmail.com","threadId":"24060","inReplyTo":"20100610060525.GA2177@m62s10.vlinux.de","subject":"Re: Git and svn as target","fromName":"Avery Pennarun","fromEmail":"apenwarr@gmail.com","sentAt":"2010-06-10T07:11:13Z","receivedAt":"2010-06-10T07:11:13Z","isPatch":false,"sender":{"key":"apenwarr@gmail.com","avatar":"https://avatars.githubusercontent.com/u/20592?v=4"},"body":"On Thu, Jun 10, 2010 at 2:05 AM, Peter Baumann <waste.manager@gmx.de> wrote:\n> On Thu, Jun 10, 2010 at 07:45:15AM +0200, Matthias Fechner wrote:\n>> In the commit of svn I see only merged test...\n>> Could I say git to put all the commit comments into the merge?\n>\n> AFAIK git svn doesn't handle git merges very well. If you rebase your test branch onto\n> master and then do the git-svn dcommit, everything should work as expected.\n\nRight.  I actually like it that way much more than I like rebasing\nonto master, but that's a matter of opinion, of course.  Another\noption would be to simply do \"git svn dcommit\" from the 'test' branch\nrather than merging it into master first.  (This essentially asks\ngit-svn to do your rebasing for you, so it's roughly the same thing as\nmerge-rebase-dcommit.)\n\nYou might like to look at the option \"merge.log\" in \"man git-config\".\nThis summarizes your commit messages into the merge commit's commit\nmessage, sort of like how svn itself does it.  Then you still only\nhave one merge commit - like you do in svn - but it has a useful\ncommit message.\n\nHave fun,\n\nAvery\n"},{"id":"143685","messageId":"4C165A60.2010508@fechner.net","threadId":"24060","inReplyTo":"AANLkTino5sVtNEFV5_nGi9NmlhBCc0-_4NhTZwKdDzho@mail.gmail.com","subject":"Re: Git and svn as target","fromName":"Matthias Fechner","fromEmail":"idefix@fechner.net","sentAt":"2010-06-14T16:35:44Z","receivedAt":"2010-06-14T16:35:44Z","isPatch":false,"sender":{"key":"idefix@fechner.net","avatar":"https://gravatar.com/avatar/3bbc5542677a77cb9b75262e4ad2eeb04a0960f0b8dec89a178db17cf472cce7?d=mp&s=160"},"body":"Hi,\n\nAm 10.06.10 09:11, schrieb Avery Pennarun:\n> Right. I actually like it that way much more than I like rebasing\n> onto master, but that's a matter of opinion, of course.  Another\n> option would be to simply do \"git svn dcommit\" from the 'test' branch\n> rather than merging it into master first.  (This essentially asks\n> git-svn to do your rebasing for you, so it's roughly the same thing as\n> merge-rebase-dcommit.)\n>    \n\nthanks, I got it working with the following sequence:\ngit svn fetch\ngit svn rebase\ngit branch test\ngit checkout test\nseveral commit with commit messages\ngit checkout master\ngit svn fetch\ngit svn rebase\ngit rebase --interactive --preserve-merges test\ngit svn dcommit\n\nNow I can see all local git commit as commits to the svn repository.\n\nBye,\nMatthias\n\n-- \n\"Programming today is a race between software engineers striving to build bigger and better idiot-proof programs, and the universe trying to produce bigger and better idiots. So far, the universe is winning.\" -- Rich Cook\n"}]}