Lots of ‘fun’ today merging two CVS branches. The merge itself wasn’t too bad, only about four files with conflicts. The pain came from the fact that the branch I was merging from wasn’t a complete piece of work. It was in a phase two of three state which meant that not all aspects were working. But the powers that be have decided they need the work done so far to be released into testing next week!
Ah well, got it all working in the end. Only another four merges to go!
Battle of the Blogs
The Guardian is running a Best British Blogs competition with a £10,000 prize.
Hmmm… should I enter?
BlogChalking
Google! DayPop! This is my blogchalk: English, United Kingdom, Stockport, Bredbury, Mike, Male, 36-40!
WTF? See BlogChalking for details.
Fun With Branches
I’ve been having fun with branches today. No, not the tree kind, CVS branches: parallel branches of code development. I’ve got to bring together several branches of development (five in fact) in order to do a new release of code. Quite a complex job. I spent quite a while just getting my head around what was where and what was going to be merged with what, and in what order.
The resultant diagram looks like this (reduced in size and details removed).
The Unbearable Lightness of Being
Hmmm… I finished The Unbearable Lightness of Being by Milan Kundera on the train into work this morning. Hmmm… I found it very inconsistent; It had it’s good bits, and whilst, yes, some of the ideas put forward are interesting and thought provoking, I was a little disappointed. I found that the characters and storylines are used merely as a vehicle for the “wide range of brilliant and amusing philosophical speculations” presented. So much so that the author interrupts the narrative to speak directly to the reader, and in the latter half of the book, the story line jumps about for no good reason other than to provide an opportunity to re-enforce a previous idea or present a new one.
All in all a little disappointing. 🙁
A Good Day
Had a good day at work today. Did a hand over of my development to the other guys on the team, and did lots of bitty code management type things. Code reviews, CVS branch merging, etc. Also had time for people’s queries without having to wish they would go away and let me get on with what I’m in the middle of.
On the other hand it was TOO HOT! Again! ‘Only’ reached 85F today, plus I went to work in knee length shorts so it wasn’t as bad as yesterday, but still too hot!
School
The next week or so is the last time all the kids (Jamie and the grand-kids) will be in school together. Next September Thom is off to the ‘big school’.
Sunday
Yeah, I know it’s Monday night!
Sunday was a really nice day. It’s about time we had some good weather in the middle of July!
Anyway, I cleared the shed out on Sunday, and finally got to my bike! It’s the first time I’ve been able to get it out of the shed since before Christmas. I’ll get the rust cleared off it and start going to work on it again.
Steve, Kim and Megan came round. Kim’s seems to be recovering from her operation. “Still a bit sore” she says. Speedy recovery Kim. Megan did very well in her school report too.
Jamie got her bike out too. She’s rather too big for it now. We’ll have to see about getting her another one.
