Skip to main content

Don't be a fiend, commit often.

You must know this pain. 

 

hg commit -Am "Massive commit of whole days work"

hg push

TIME FOR MERGING HELL! PREPARE YOUR ANUS!

 

As a comparison, merging tool we use Beyond Compare. Indeed it's not a bad tool. But it's not clairvoyant. No tool can completely remove headaches that are generated from both the above message and also rolling back from changes that have been commited. 

As mentioned, one of the boons of source control is the rolling back of changes if needed. I think this can be made difficult when you are checking in a ton of work at once from all sorts of little fixes, changes, tweaks and implemented functionality. 

My dream is to commit work discretely by feature. For example in CRUD land. You would discretely check in the create mechanism, view mechanism and so on. If you see small bugs elsewhere, write them down. Fix them in their own seperate commit afterwards (or before depending on the situation). 

I like breaking work down into features (what some people like to call requirements) that can then be tested, implemented and commited discretely. You can then have commit messages like; 

 

hg commit -Am "As an admin user you can now add customers to a business account"

 

When looking at the repository you can then see a nice development of features and how / when they were implemented. 

I'm not saying I do this all the time. It's what I aspire to do. I can still be a fiend to not commiting discretely and also nipping little bits and bobs in. But the more you try to do this, the better your life will be. 

Comments

Dom Finn said…
Yeah the csproj can be a real pain but just in general, the more you have to manually merge the greater the chance is of a cock up. I just feel a cold sweat every time Beyond Compare reveals it's ugly head.

Popular posts from this blog

Making your domain less mutable

This happens regularly to me (and from my anecdotal investigation everyone involved in large / old projects). We need a new piece of functionality. I write it, it's beautiful and I win the internet. I have estimated 8 days (or 22.23 lol-points depending on how you live) and it's only taken 4 days. Ah, but then a very small; mostly ignored and very unimportant detail rears it's cruel head. You need to make it work with the code that exists already. This is normally in the form of saving to some pre-existing entities. Oh dear. You save everything through the various management / service classes that exist already and nothing works. So begins the next couple of days of horror. You find that you didn't set the work = true . Most of my woes in this area are caused by modifications at layer further down (or the stored procedure it finally ends up in) changing the object that I was trying to save or not saving part of the object because of some rule. So many errors

My home office upgrade wish list.

My home office is almost due an upgrade. I have been holding off until my youngest daughter is out of her cot as then we can finally dispatch the enormous monstrosity of a cot out from the kids bedroom and the drawers that are in my office can be banished giving me better access to my wonderful whiteboard. My other improvements will be purchasing a new, larger monitor. I currently work from a single 22ich Samsung which just doesn't cut it anymore, I did have two at some point but I can't recall what I did with it. I really enjoy using a touch screen so I think I will go for one of these 27inch Hannspree models that I have used before. I put a lot of hours in at home and whilst I have a reasonable chair I still tend to suffer with some back problems, so my next port of call will be to get a Varidesk for home. It works an absolute treat at work and just lets me switch stuff up when I feel like it. they take a reasonable amount of desk space up but I tend to leave my desk fairly

IIS Administration using Microsoft.Web.Administration using F#

A friend had mentioned his joy at using Powershell. I guess this is pretty cool and I don't mind Powershell. I sort of missed the boat a little with it because I haven't done any Windows Administration since I used to look after Windows Server 2000 machines (and possibly a couple of 2003). At that time I had a different arsenal to cause untold woe on my fellow colleagues....VBSCRIPT!!!! Boy could I cause trouble with that. With a combination of that, VBA and SQL I used to love creating spider webs of pure madness, once written the apps were tied together so precariously; one false move and the entire thing would explode.... anyway that's a different story. Back to the Powershell. He was using it to automate IIS (or else I heard what I wanted to so I could try and push F# onto him, who knows?). I have heard various stories of extremely large platform automation scripts being written recently (for example  .net rocks interview with Steve Evans ) and whilst they seem to be g