Categories
Rants Technology

Pending Changes

One of the great habits now ingrained into my being are doing diffs on code before committing a check in. It’s a great habit, and worth the extra quick 2 minutes. It’s also a great time to review your changes and get your head into the right space for your next move. Of course, having great tools like Subversion and Tortoise (or even git and bzr) make the job a pleasure. But then you have this…

Pending Changes

(Names have been blanked for privacy reasons)

My pending changes tells me i got a whole bunch of changes to commit but comparing each one tells me they’re the same. 😮 Not exactly conducive to keeping up a good habit, i would say. I actually only had 4 files that really changed, in case you’re wondering. No amount of refreshing, getting latest version or checking out could give me just the files i want to review before committing. Sigh.

And most people still ask me why i insist on using open source tools to do the job (properly) :p

UPDATE:

I stumbled upon Derek’s posting on TFS and it does seem that things which should be simple (and were solved moons ago) are indeed quite difficult with TFS. The “plus” side though is ian has taken the time out to do something about it: cue LizardTF. Keeping an eye on that while i simply have to use TFS…

Categories
Technology

Bzr

Bzr have just launched their latest version. And while i’ve used it for development control on my *nix, i’ve also migrated it’s use onto Windows. The earlier versions were all very command-liney and so un-windows-like, but in it’s defence, the good ‘ol command line really is pretty fast and efficient for some tasks. Anyhoooo….

The latest bzr version for Windows, really has a best-of-both-worlds feel to it. Just go get it already 🙂

Categories
Technology

Subversion and Bzr

Subversion has been a friend of mine for some time now. Given the order of environments I have been required to work in, it’s more than suited our needs… anyhooo. Then there’s Bzr which has really grown on me, especially for offline version control. But what is really cool, is using both of them. I probably could set up a bzr server, but the subversion repository is already in place… incremental adoption always works smoother.

How easy is it? Just run bzr branch <svn:uri> and you’re set. Easy. Then you can run multiple ‘bzr commit’ commands to keep a local versioned control record of code changes, and when you’re within connectivity with the subversion repository, just ‘bzr push’ and Robert is your father’s brother. ‘Bzr update’ will check out changes from the repository.

For straightforward environments, this should suit you just fine with minimal fuss for a lot of satisfaction.