4 ms·

This is incredibly timely and I for one appreciate the post. I'm just moving myself and a team from past-experience of SVN into the world of git. None of us kn

by buro9 17y ago

This is incredibly timely and I for one appreciate the post. I'm just moving myself and a team from past-experience of SVN into the world of git. None of us know git, but we're all vaguely aware of it. Unfortunately the place we are at requires us to integrate with ClearCase and SVN, and to make matters worse we're all on Macs and Linux for which ClearCase tools don't appear to exist. Our proposed solution to bring sanity to this is to use git with git-cc and git-svn to act as bridges to the legacy systems, whilst putting all new work natively into git. Now... I'll be the first to admit that we're not full of confidence about this as it's the fear of the unknown, so if anyone else has solid advice on how to work with git and workflows and integrating into existing legacy systems I would be keen to hear it.

fragmede 17y ago
Are you trying to integrate ClearCase with svn (with git as the go-between bridge)? Thats a bit more than I've had to deal with (though I've heard of perforce->(git)->svn being done). As for git-svn itself, I'll say what I said on the other thread - what finally got me to switch is that with git-svn, my local copy is a real live Git repo. Which means the code I write, my actual work, is all still there and accesible via standard Git commands that I can look up. The fix for the worst-case scenario? I do a fresh svn checkout to a new directory, and I do git checkout, I copy the files out, I do an svn commit of that version of files. Far from ideal, but knowing that I could recover from worst the system could throw at me, put me quite at ease. (Yeah, yeah git svn dcommit, but we're talking about a fearsome worst-case scenario.)
- buro9 17y ago
  We all have experience with SVN, and that's been our preferred setup in our prior roles. Here, ClearCase is used by the back end services team and they use that to push things through the different environments too. So at some level we need to access their code, and to contribute code to their repository. SVN is used by other rogue developers to try and avoid ClearCase... very understandable really. So we also need to get some of their code and contribute to them. So neither holds all knowledge, and IBM doesn't provide ClearCase software for Mac OS X. So what we're looking at is a git-cc bridge to go in that direction, installed on a Windows box and then allowing us internally to use git to work and then just to periodically push upstream from the Win box. And as we'll be using git, it seems desirable (though not required) to use the git-svn bridge if that works well as then we only need to use the one tool daily. I've read a lot about how to setup the CC2Git bridge, and no solution seems great but all appear to be adequate enough for it to work at some level. I haven't checked out git-svn too much but what I had read was mostly good. The concerns we have are once we're in the git world, how do you use the thing? I've seen a lot mentioning the importance of understanding git and workflows, but not a great deal describing git for SVN users and then showing simple to follow guides that not just communicate the commands, but also a nice and solid workflow.
  - fragmede 17y ago
    I assume you've seen the git svn crash course (http://git.or.cz/course/svn.html http://git.or.cz/course/svn.html) which is good overview, but falls short on the subtleties of merging (particularly using git pull --rebase). The side-by-side commands in the two VCS it has is great. The ParrotVM wiki also has a git-svn guide (http://trac.parrot.org/parrot/wiki/git-svn-tutorial http://trac.parrot.org/parrot/wiki/git-svn-tutorial) that I've found quite helpful and has an introductory workflow. (Alternately, it looks like svnimporter (http://www.subversionary.org/projects/svnimporter http://www.subversionary.org/projects/svnimporter) can import ClearCase which gets at a tiny subset of your problem.)
deleted 17y ago
[deleted]
dschobel 17y ago
It seems to get linked with every git story on HN but schacon's Pro Git is unequivocally the best reference and tutorial I've found: http://progit.org/book/ http://progit.org/book/ Workflows: http://progit.org/book/ch5-1.html http://progit.org/book/ch5-1.html Git and Other Systems: http://progit.org/book/ch8-0.html http://progit.org/book/ch8-0.html

by buro9 17y ago

fragmede 17y ago

Are you trying to integrate ClearCase with svn (with git as the go-between bridge)? Thats a bit more than I've had to deal with (though I've heard of perforce->(git)->svn being done). As for git-svn itself, I'll say what I said on the other thread - what finally got me to switch is that with git-svn, my local copy is a real live Git repo. Which means the code I write, my actual work, is all still there and accesible via standard Git commands that I can look up. The fix for the worst-case scenario? I do a fresh svn checkout to a new directory, and I do git checkout, I copy the files out, I do an svn commit of that version of files. Far from ideal, but knowing that I could recover from worst the system could throw at me, put me quite at ease. (Yeah, yeah git svn dcommit, but we're talking about a fearsome worst-case scenario.)

buro9 17y ago
We all have experience with SVN, and that's been our preferred setup in our prior roles. Here, ClearCase is used by the back end services team and they use that to push things through the different environments too. So at some level we need to access their code, and to contribute code to their repository. SVN is used by other rogue developers to try and avoid ClearCase... very understandable really. So we also need to get some of their code and contribute to them. So neither holds all knowledge, and IBM doesn't provide ClearCase software for Mac OS X. So what we're looking at is a git-cc bridge to go in that direction, installed on a Windows box and then allowing us internally to use git to work and then just to periodically push upstream from the Win box. And as we'll be using git, it seems desirable (though not required) to use the git-svn bridge if that works well as then we only need to use the one tool daily. I've read a lot about how to setup the CC2Git bridge, and no solution seems great but all appear to be adequate enough for it to work at some level. I haven't checked out git-svn too much but what I had read was mostly good. The concerns we have are once we're in the git world, how do you use the thing? I've seen a lot mentioning the importance of understanding git and workflows, but not a great deal describing git for SVN users and then showing simple to follow guides that not just communicate the commands, but also a nice and solid workflow.
- fragmede 17y ago
  I assume you've seen the git svn crash course (http://git.or.cz/course/svn.html http://git.or.cz/course/svn.html) which is good overview, but falls short on the subtleties of merging (particularly using git pull --rebase). The side-by-side commands in the two VCS it has is great. The ParrotVM wiki also has a git-svn guide (http://trac.parrot.org/parrot/wiki/git-svn-tutorial http://trac.parrot.org/parrot/wiki/git-svn-tutorial) that I've found quite helpful and has an introductory workflow. (Alternately, it looks like svnimporter (http://www.subversionary.org/projects/svnimporter http://www.subversionary.org/projects/svnimporter) can import ClearCase which gets at a tiny subset of your problem.)

deleted 17y ago

[deleted]

dschobel 17y ago

It seems to get linked with every git story on HN but schacon's Pro Git is unequivocally the best reference and tutorial I've found: http://progit.org/book/ http://progit.org/book/ Workflows: http://progit.org/book/ch5-1.html http://progit.org/book/ch5-1.html Git and Other Systems: http://progit.org/book/ch8-0.html http://progit.org/book/ch8-0.html