Source Control Headaches…

It seems like it’s at least once a week that I end up fighting with source control (Vault, I’m looking at you). You’d think there’d be a better way to do things. I’ve looked at Mercurial and Git, but both seem somewhat complicated and less Windows-friendly (and less user-friendly). Anyone have any suggestions for decent source control systems on Windows?

Advertisements

3 comments

  1. Paul Roub

    As much as I hate being the marketing guy who jumps in at the first mention of his product…

    I’m also the product manager and a fellow developer — I’d love to hear what problems you’re having, what version of Vault you’re running, and whether you’ve been in touch with support on any of this.

  2. Joel

    Wow Paul, I’m flattered! I’m not at work right now, so I don’t have my version numbers handy…

    We recently did an upgrade of our vault software, and somehow during the upgrade process I had half of the files of my main Visual Studio solution in various projects go renegade. I have no idea why they went renegade (perhaps a change in servers that Vault was running on?), but I ended up having to go through each one, do a diff to see if I had indeed made any changes. I had touched quite a few files with the bits that I was working on before the upgrade, so I couldn’t just do a “get latest” and have it overwrite everything (for some reason, doing a “get latest” and telling it to merge didn’t fix the renegade files that I hadn’t touched, so I was forced to overwrite them). Even after doing that, then getting the latest and then modifying a file (which would normally cause a check-out), I still had a few files go renegade. Doing another “get latest” and then editing the file seemed to fix things though.

    I also find adding and removing files from Visual Studio can sometimes cause problems with Vault. It’d be nice if removing a file from Visual Studio didn’t immediately delete it from source control, but instead flag it for delete on the next general check-in (or check in of that particular delete action… if that makes any sense).

    I think the other than the usual fighting over source control happens when we are all working with a few commonly used and edited files, things work. It’d be so much more awesome thought, to have some sort of real-time document editing tool, but I think we are still a few years off from that. Strangely enough, one of the coolest multi-user editing tools was a game called Cube which allowed multiple people to collaboratively work on a level in real time. Of course it wouldn’t always make sense to have such things with source code, but it’d still be really cool.

  3. Joel

    Paul, I really wouldn’t worry too much about it. I suspect it was just a combination of things that happened. Things seem to be working now, so I’m not too worried about it. I think I was just in one of my ranting moods at the time of the post…

Leave a Reply

Fill in your details below or click an icon to log in:

WordPress.com Logo

You are commenting using your WordPress.com account. Log Out / Change )

Twitter picture

You are commenting using your Twitter account. Log Out / Change )

Facebook photo

You are commenting using your Facebook account. Log Out / Change )

Google+ photo

You are commenting using your Google+ account. Log Out / Change )

Connecting to %s