Comments on: Acclimating to a non-file-locking version control system

By: Jennifer Griffin

Jennifer Griffin — Sat, 12 Jul 2008 03:45:18 +0000

Our company is moving to Subversion in the near future. I knew there were going to be differences but this really makes it clear. Great post!

By: Jim Cropcho

Jim Cropcho — Fri, 11 Jul 2008 14:53:25 +0000

Holy shit! I had no idea anybody was still using file-locking version control systems. I’ve heard a fair number of no-VCS-in-shop horror stories, but I figured anybody using a VCS would use something modern. Congrats on the move, though. If you’re using SVN, then after you get accustomed to it, consider switching to git-svn to work with your code as a git repository.

Disclaimer: I’ve never held a traditional CompSci job, so if this file locking VCSs are still common, then I may sound like an idiot.

By: Josh

Josh — Mon, 07 Jul 2008 12:58:35 +0000

I’m a fan of TortoiseSVN – it’s a great SVN client, my favorite part of which is the Repo-browser that lets you navigate a repository. The merge tool is great too.

Check it out:
http://tortoisesvn.net/

By: Jay R. Wren

Jay R. Wren — Sun, 06 Jul 2008 18:14:17 +0000

Its lock-modify-unlock v. copy-modify-merge.

http://svnbook.red-bean.com/en/1.4/svn.basic.vsn-models.html

Like Matt says, if there is a conflict, you won’t be able to commit. So the point above about overwriting someone else’s changes is not true… unless you are stupid and ignore the messages that merges are needed. Then not only are you not making friends on the team, you are stupid too

By: digimatt

digimatt — Sat, 05 Jul 2008 05:06:15 +0000

Having spent the first couple of my years as a working developer on SVN, I found my move to the “big leagues” post-college to be extremely frustrating SCM-wise, first with PVCS and then VSS. Exclusive-locking systems can kiss my a– oh hey look, it’s something shiny over there.

By: Matt

Matt — Sat, 05 Jul 2008 02:14:21 +0000

When coding in eclipse I like using subclipse for SVN. It won’t commit changes if there is a conflict. Instead you will get an error. This is very good for the times where I forget to update first before trying to commit.

By: Corey Haines

Corey Haines — Fri, 04 Jul 2008 18:00:28 +0000

Excellent advice, Gayle!

I remember having to switch my mindset when I went from VSS to SVN.

Now just wait until you start getting introduced to DSCM, which is a whole different way of managing your source. Blows your mind.

By: James Bender

James Bender — Fri, 04 Jul 2008 17:00:15 +0000

It’s always weird moving from one VCS to another. They all seem to work just differently enough to be a pain.

I have to say though, the merging has gotten WAY WAY better since the days of Visual Source Safe. That was always a “say a little prayer, cross your fingers, grit your teeth, close your eyes and hit the button” kind of thing

BTW, we have a rule on my team; if you break the build (check in broken code) you have to buy the team lunch. A “nice” one too, no fast food. Can get to be quite an expensive mistake on a large team.