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

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

Arduino ethernet shield

My ethernet shield arrived this morning from Hong Kong. Looking forward to making a little Arduino based Web server! The price for the shield was only ?5 on ebay including delivery :-) super cheap considering how much they cost a couple of years ago.

Specflow

After listening to .Net Rocks with Scott Millett this week I felt a renewed enthusiasm for trying out some BDD. I downloaded Specflow and got straight on with the screen cast they have on their website. The video acts as a good introduction into how to get up and running in Specflow. Interestingly it also gave me a better insight into how bowling works. I have never really thought about it. I normally just wang the balls down the lane until the game is over! Specflow introduces the idea of writing the specification first. It uses a specific language called Gherkin which comes from Ruby land. You will need NUnit installed as well. An example of it is:  [edit: NUnit is what I have used up to now but Specflow is compatible with other testing frameworks aswell. See the comments section below.] Feature : Passwords In order to have a strong password As a new user or existing user changing my password I need to check if my password is alphanumeric and is greater than 6 characters Scenario