{"thread":{"id":"17530","subject":"Git -> SVN importing","startedAt":"2009-02-03T15:17:17Z","lastAt":"2009-02-03T17:29:16Z","messageCount":4,"participants":["Tim Visher","Bruce Stephens","Edward Z. Yang","Daniel Barkalow"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"102971","messageId":"c115fd3c0902030717u6a8f3bbck3027cf74715c79a4@mail.gmail.com","threadId":"17530","inReplyTo":null,"subject":"Git -> SVN importing","fromName":"Tim Visher","fromEmail":"tim.visher@gmail.com","sentAt":"2009-02-03T15:17:17Z","receivedAt":"2009-02-03T15:17:17Z","isPatch":false,"sender":{"key":"tim.visher@gmail.com","avatar":"https://gravatar.com/avatar/98307ce54bcac1a46b5d845827d5386e2a27895ff08790cdd3877ad527760575?d=mp&s=160"},"body":"Hello Everyone,\n\nIn light of company decisions that are yet to be known, we may in the\nfuture be stuck using svn.  My team and I really want to experiment\nwith Git, but one of the concerns that my supervisor brought up was\nthat in the future we want to be sure that we can relatively\npainlessly bring the history into svn if required.  Obviously, it's\nexpected that we would loose the local branching history, but we would\nwant at least the published information to be sucked back into svn\nwithout change, if that's possible.\n\nI figured that someone would have to have done this before since\ngit-svn is so magical.  However, I thought I'd ask.\n\nWhat's the story?\n\n-- \n\nIn Christ,\n\nTimmy V.\n\nhttp://burningones.com/\nhttp://five.sentenc.es/ - Spend less time on e-mail\n"},{"id":"102973","messageId":"80k5871qf0.fsf@tiny.isode.net","threadId":"17530","inReplyTo":"c115fd3c0902030717u6a8f3bbck3027cf74715c79a4@mail.gmail.com","subject":"Re: Git -> SVN importing","fromName":"Bruce Stephens","fromEmail":"bruce.stephens@isode.com","sentAt":"2009-02-03T15:38:43Z","receivedAt":"2009-02-03T15:38:43Z","isPatch":false,"sender":{"key":"bruce.stephens@isode.com","avatar":null},"body":"Tim Visher <tim.visher@gmail.com> writes:\n\n[...]\n\n> I figured that someone would have to have done this before since\n> git-svn is so magical.  However, I thought I'd ask.\n>\n> What's the story?\n\nMy guess is there aren't many people who've migrated from git to svn.\n(And fewer who'd admit to it on this mailing list.)\n\n[...]\n"},{"id":"102974","messageId":"4988654B.1080903@thewritingpot.com","threadId":"17530","inReplyTo":"c115fd3c0902030717u6a8f3bbck3027cf74715c79a4@mail.gmail.com","subject":"Re: Git -> SVN importing","fromName":"Edward Z. Yang","fromEmail":"edwardzyang@thewritingpot.com","sentAt":"2009-02-03T15:39:55Z","receivedAt":"2009-02-03T15:39:55Z","isPatch":false,"sender":{"key":"edwardzyang@thewritingpot.com","avatar":"https://gravatar.com/avatar/a805a0a3c1d7d36e7fe22270596e4d812723652933c59cac267e67c79126fdd0?d=mp&s=160"},"body":"Tim Visher wrote:\n> I figured that someone would have to have done this before since\n> git-svn is so magical.  However, I thought I'd ask.\n\nYou want to look at git svn dcommit.\n"},{"id":"102996","messageId":"alpine.LNX.1.00.0902031213540.19665@iabervon.org","threadId":"17530","inReplyTo":"c115fd3c0902030717u6a8f3bbck3027cf74715c79a4@mail.gmail.com","subject":"Re: Git -> SVN importing","fromName":"Daniel Barkalow","fromEmail":"barkalow@iabervon.org","sentAt":"2009-02-03T17:29:16Z","receivedAt":"2009-02-03T17:29:16Z","isPatch":false,"sender":{"key":"barkalow@iabervon.org","avatar":"https://avatars.githubusercontent.com/u/55364219?v=4"},"body":"On Tue, 3 Feb 2009, Tim Visher wrote:\n\n> Hello Everyone,\n> \n> In light of company decisions that are yet to be known, we may in the\n> future be stuck using svn.  My team and I really want to experiment\n> with Git, but one of the concerns that my supervisor brought up was\n> that in the future we want to be sure that we can relatively\n> painlessly bring the history into svn if required.  Obviously, it's\n> expected that we would loose the local branching history, but we would\n> want at least the published information to be sucked back into svn\n> without change, if that's possible.\n> \n> I figured that someone would have to have done this before since\n> git-svn is so magical.  However, I thought I'd ask.\n> \n> What's the story?\n\nWhat other people have done in similar situations is use git on their \nworkstations as an extra-nice svn client, keeping the official history \nsvn-compatible (and actually stored in svn) until relevant management is \nconvinced that git is the way to go. I don't think anybody's written code \nto import a general git history as well as possible into svn.\n\nThe fundamental issue is that svn doesn't have any way to represent that a \nbranch's history includes two sets of commits which were done in parallel, \nand it's impossible to automatically distribute merge conflict resolutions \nover the series that led to the merge, which means that you can't really \nproduce a reasonable representation of the intermediate steps on the \nsecond branch.\n\nThat is, you'd not only lose the local branching history, but some of the \nmiddle commits in the resulting linear history would be bogus, with \ncontent which is not like what the author actually did.\n\n\t-Daniel\n*This .sig left intentionally blank*\n"}]}