I’ve spent all day merging code streams together today. It’s been quite painful because I’ve not been able to use CVS‘s automatic merging, and had to do it all by hand. Basically, half the stuff on one branch has already been merged, and now they want the other half, except for one change. But I think I’ve got it all done now. I just need to test it thoroughly.

Woot! I had to work late tonight to help implement Project Dandy’s CMS system into the live admin environment on the mainframe. And it worked! Apart from one minor hiccup, I forgot we need to add a new row into a DB table, everything went swimmingly. All initial tests seem to indicate it’s fine.
Even my hastily thrown together code to populate one of the new tables worked!

I finally got my SQL working! 🙂 I managed to finish the job it was for this afternoon. With any luck, we are still on schedule to go live with the CMS tool tomorrow evening. I’ve got to work late to help implement it, but I don’t anticipate any major problems. Other than that it’s been business as usual in the office. Too hot (it reached 85.5 again today), too busy, etc.
One interesting thing, as I was standing outside smoking, Aamir came past on his way to a client with one of the salesmen, and said “I’m going to show someone your web site, do you mind?” I said “No, of course not.” But then he had to go catch a train. I’m intrigued. I’ll speak to him tomorrow.

belated post
I didn’t get to do much tonight, I had some ‘homework’ (overtime) to do. No much progress with that either. I’m battling with a complicated SQL query. I’ve nearly got it to work but not quite. Very frustrating 🙁

Things have been hotting up at work. Project Dandy is nearing completion: the admin/cms system should go live before the end of next week, and the front end web site the following week. It’s been a long time coming this one. But it’s looking good. The list of bugs has been under 20 for the last couple of days, and some of those are fairly minor. The test cycles seem to be going well with less than predicted failures for the last one, and the current one looking promising.
An old friend from a couple of companies ago (for whom I got some contract work last year) started full time employment here this week.
This week I’ve been estimating for future work over the next couple of months. Today I saw the outline plans for the next three months. Some of the projects which were put on hold to concentrate on Dandy will be coming back on line. Good, I should be able to reduce the number of parallel branches of development (10 is too many really!)

It was my first day back at work today. My train was late, no surprise there then. Thankfully I didn’t have a couple of hundred emails to deal with, I’d been dealing with them on and off from home. Well actually I did have more than 200, but most of those were auto-generated bugzilla posts, and various reminders. I did, however get stuck back straight away, a new release of the code, and a merge to be done today.
About half way through the day, when I turned around to talk to someone, I realised that half the people in my part of the office had moved desks! Very confusing. In the end it wasn’t too hard a day.
On the way home, my train was very late, then cancelled, then the next one was late! And when I got to Stockport, they’ve boarded up my bus stop for refurbishment! I had to go and find the new place to catch my bus.
When I got home, I also realised that my neck ache was back. This is the first time in three weeks! There must be something wrong with my setup at work. I think I’m going to have to lower my monitor position.

I’ve just remembered; today is the second anniversary of my starting at Eunite Ltd.

I was a busy little bee today at work. Three releases, two estimates, and one major disaster solved! It doesn’t get any easier. I ended up working a few hours overtime to sort a serious problem on one of the clients live sites. At least I don’t have to be around at 5am tomorrow when the fix goes in!