{"thread":{"id":"12616","subject":"Q: workflows when tied back to git-svn","startedAt":"2008-03-10T14:15:05Z","lastAt":"2008-03-10T14:15:05Z","messageCount":1,"participants":["Nigel Magnay"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"71584","messageId":"320075ff0803100715y2675c7aax6548535454083d52@mail.gmail.com","threadId":"12616","inReplyTo":null,"subject":"Q: workflows when tied back to git-svn","fromName":"Nigel Magnay","fromEmail":"nigel.magnay@gmail.com","sentAt":"2008-03-10T14:15:05Z","receivedAt":"2008-03-10T14:15:05Z","isPatch":false,"sender":{"key":"nigel.magnay@gmail.com","avatar":"https://gravatar.com/avatar/d85cf38287bef3a8e4fa02358d2756d7589f8676c5eeb881ce2f6d731e4526c3?d=mp&s=160"},"body":"Hi list;\n\nWe have a number of projects which currently are mastered in a\ncentralised svn repo, and it makes use of svn:externals. It's becoming\nincreasingly apparent (finally) that everyone working in the various\nproject /trunks is not working, and what's really required is a number\nof branches. Also that the git submodule approach is superior (for our\nneeds) to svn:externals.\n\nNow ideally, I could swap us all over to git; I've been using git-svn\nfor a while and it works very nicely (modulo not noticing the\nrequirement to merge with --squash, which is obvious once you know!).\nHow-ev-er.. the natives are revolting.. some people didn't even want\nto move to SVN from CVS let alone a new tool. Alas some people just\ndon't like change.\n\nI'm guessing I can give teams their branches in svn, and manage the\nmerging back with git and git-svn - that way I'll retain some kind of\nsanity in repeated merging. For those devs with the right fu can start\nusing git directly, and we slowly start deprecating the whole svn\ninfrastructure a bit at a time.\n\nAnyone got any experiences of doing this (particularly things to note,\nlike the --squash thing that might trip us up, or workflows)? I've\nnever tried dcommitting back to anything other than trunk..\n\nSecondly (slightly related) - because of our svn:externals usage, we\ntend to have a lot of repeated repo checkouts. I'm *assuming* that If\nI've got 2 git modules that have the same submodules (e.g\nA\n  mod1\n  mod2\n\nB\n mod1\n mod2\n\nThen it's 'safe' to make the mod1 and mod2 directories symlinks to the\nsame directory?\n"}]}