What does everyone use for scm?

Does anyone use git for source control? Once you learn it it's about the most painless source control I've ever used.

http://git-scm.com/

12/20/2010 8:17:41 AM

used svn for a long time
been using tfs for the last 2 years
my team did some exploratory work with git and mercurial, and decided to use tfs 2010
i still use mercurial for a few personal projects

12/20/2010 9:32:32 AM

I use svn - VisualSVN Server on windows and I build my own on LAMP stacks.

12/20/2010 9:41:01 AM

ClearCase at work. If I had to use something for a personal project I'd use mercurial for a small project and git for a large one.

12/20/2010 11:57:55 AM

SOURCE CONTROL TO MAJOR QNTM

12/20/2010 12:02:44 PM

TFS all the way, even for personal. I used to use svn for personal, but msdn sub prompted me to switch to TFS for personal too.

12/20/2010 12:20:56 PM

We use Perforce

12/20/2010 12:55:21 PM

i use svn + tortisesvn + visualsvn

12/20/2010 1:01:40 PM

TFS, but I'm always having problems with it.

12/20/2010 1:43:46 PM

svn for everything i can get away with

cvs at work because i'm forced to

12/20/2010 2:08:16 PM

I use Mercurial for personal use, mainly because it's quick and easy.

12/20/2010 3:49:28 PM

For those interested, you can try out TFS2010 from here. 90 day trial

Looks like you can purchase the server license (with 5 cals) on CDW for ~$100 here

I like GIT a lot, especially for community/group projects, but for personal projects and business projects TFS is waaayyy easier to deal with.

12/20/2010 4:46:40 PM

It should come as no surprise that my former employer that went bankrupt was using SCCS as late as 2006 for ~500,000 lines of code in several hundred files being used/accessed by 20-40 engineers at any one time.

12/20/2010 6:01:38 PM

Considering there are so many awesome free options it's strange to me people pay for SCMs. I understand why executives may want/need analytics and metrics, but that's different issue.

git is certainly simple enough for personal projects especially with it's emphasis on local operations, and it's a god send for business projects. If you've ever had a bad commit nested in a separate branch a week or so back, bisect is heaven. SVN does that too now apparently. Merging and pushing branches around is also easier when you can experiment locally first.

What's SCCS?

[Edited on December 20, 2010 at 7:08 PM. Reason : a]

12/20/2010 7:07:19 PM

I used SVN until TFS was free for me.

12/20/2010 7:09:19 PM

http://en.wikipedia.org/wiki/Source_Code_Control_System

Quote :

"Source Code Control System (SCCS) was an early revision control system, geared toward program source code and other text files. It was originally developed in SNOBOL at Bell Labs in 1972 by Marc J. Rochkind for an IBM System/370 computer running OS/360 MVT. It was later rewritten for UNIX, then running on a PDP-11 and released with the Programmer's Workbench (PWB) edition of that operating system."

19 fuckin 72.

12/20/2010 10:32:50 PM

I compile a bunch of hosts files together and host the finished product on Google Code via SVN: https://jansal.googlecode.com/svn/trunk/adblock/hosts

12/20/2010 10:54:57 PM

clearcase bitches

12/20/2010 11:29:57 PM

SVN. Free, and it does everything I need. The wide selection of tools / plug-ins that work with it is great. Will eventually get around to really looking at Git.

[Edited on December 20, 2010 at 11:59 PM. Reason : ]

12/20/2010 11:58:33 PM

Google Code is going away, so migrate your shit to GitHub: http://arstechnica.com/information-technology/2015/03/google-to-close-google-code-open-source-project-hosting/

3/12/2015 2:24:01 PM

Does anyone not use git? I haven't met anyone that doesn't use it in the 5 years since I posted this.

https://gist.github.com/base698/10943264

I wrote that to calculate the percentage of code I'd written in each language I was using a long time ago. It assumes you were using git in the project folders and continues on if it's not a git repo.

[Edited on March 12, 2015 at 7:56 PM. Reason : a]

3/12/2015 7:49:23 PM

SourceGear Vault

3/13/2015 12:32:09 PM

^^Unfortunately yes.

3/13/2015 4:50:54 PM

there are people who will fight you TOOTH AND NAIL on why their antiquated-ass VCS is better than git. I don't get it. Pun not intended.

3/13/2015 8:33:23 PM

^^^ I used to use Vault for a few years. I liked it. I still use sourcegear diffmerge as my diff tool. also, the vault client would actively check in the background and let me know when there are remote changes that I need to pull in, which is a feature I really miss and haven't found in other VCS clients


been using git the last several years though, primarily w/ github though a few bitbucket and tfs online projects here and there. before that my org was on perforce. about to start consulting on a project that's on TFS


[Edited on March 13, 2015 at 10:53 PM. Reason : these days]

3/13/2015 10:45:22 PM

every time qntmfred posts in Tech Talk i feel like an idiot

3/14/2015 1:28:16 AM

i've read that google uses some homebrew installation of perforce for all their internal stuff, all in one repo. even facebook switched from svn with a git mirror to mercurial.

so as pervasive as git is, especially for open source stuff, not all big tech companies are even using git internally

3/14/2015 12:45:53 PM

^Yeah, git has a lot of issues scaling to extremely large code bases with large numbers of contributors.

But Microsoft has been extremely active (last I checked, MS Employees account for the majority of commits to libgit) in fixing the issues and filling gaps in git to really get it to enterprise grade.

3/14/2015 7:06:47 PM

Anyone want to expand on how they do source control/dev vs staging vs prod/code development for the web in general on a MAC, with AWS as the hosting?

I have been a PC user all my life and switched to a MAC recently, and also moved off of Dreamweaver (finally) at the same time. So, at the moment I use Coda2/Sketch for most of my actual creation needs, but dont feel like I have a good workflow for pushing small updates to AWS without compressing the whole package into a new "version" in elastic beanstalk, deploying, and seeing my updates live. I still mostly code in php/mysql - and my beanstalk implementation is the same on amazon linux/apache.

Any protips and ultra effective workflow suggestions would be great (or links to a post that outlines your preferred workflow).

Does everyone typically develop and run/test on their local MACs and then deploy when they are satisfied?

[Edited on March 16, 2015 at 9:51 AM. Reason : .]

3/16/2015 9:50:51 AM

I've done it two ways one involving aws and one heroku. In both cases their are two environments: production and staging. When you deploy you push to staging with git. I kind of rolled my own mechanism when I was using aws, but on heroku it's built that way. When staging is good to go I push to production and merge to master if things go smoothly.

3/16/2015 11:14:54 AM

see ya gotta grunt your gulp before you can zend an elastic ant to the cloud

too much of modern development is a mess of buzzwords

3/17/2015 8:13:40 PM

I actually had everything working make when I rolled my own.

3/17/2015 10:07:37 PM

^^^^multitude of different ways you can do this, honestly, but here's what i'd suggest:

on an apple I wouldn't use anything but git as your vcs. i wouldn't use the apple version of git that comes with xcode, though, because it's way the fuck out of date. Use homebrew or any other means to get the latest and update appropriately.

I'm a big fan of Vagrant because it keeps your machine clean of all the associated dev dependencies, and gives you a way to easily replicate build environments should you start working with someone else. Fixes the "well it worked on my machine" conundrum and is really simple to use. Local dev is also the stage where you'd use grunt or gulp to help you concat/minify/unit test/e2e test. The nice thing about all of this is that it can be configed with json manifests and javascript files along with your vagrantfile, all of which can be versioned and tracked in your git repo.

Git hooks can help you push anything to heroku or aws. I'd think if you want a staging environment, you'd probably use a heroku staging branch there, and once you felt comfortable push it over to an aws production branch. But I'm admittedly not as versed in that, because I don't use any of those things (heroku or aws) in my current place.


Of course there's a multitude of branching strategies for using git as well, but for my money when working on larger projects with multiple people, I like gitflow. https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow

If it's just you, feature branching is the less rigid and easier to manage way to go.

[Edited on March 18, 2015 at 8:58 PM. Reason : .]

3/18/2015 8:54:25 PM

i was told once that a team using subversion discouraged creating branches.

3/18/2015 10:44:58 PM

people with shitty branching strategies are the fucking worst

3/20/2015 6:39:22 PM