Bunch of Clowns
Tue Jun 17 09:00:00 CDT 2008
Cue the circus music. me: let's start with yesterday...which actually ties in to a merge from trunk a respected team member did on May 14th. (This can happen to anyone who is not paranoid enough. This was two or three merges (from trunk to our feature branch).
me: something he did with the merge did not go right
me: when I do a merge, I check in a file called merge.log that contains which commands I issued, and the result of the merge, which lists which files came across, which file deletions, and any conflicts that I would have had to resolve as part of the merge.
me: he didn't. We have no record of the actual merge command he used. we know it is not the one he thinks he used.
rendarkin: And they are not tracked automatically (the commands he used)? Yuck
me: Nope. Subversion 1.5 will treat merges as "First-class-citizens" and will track a lot of that info.
me: 1.5 rc1 has been out.
me: we aren't there yet
rendarkin: Sorry to hear it
rendarkin: Merge errors suck
me: shrug It is an interesting problem to solve
me: so...in order to parse a bunch of output from subversion and start comparing patches, I wanted my sed/awk book.
me: I could not find it in my cube yesterday
me: this morning, I got out of the shower late, helped with kiddo just a bit. was running late. scrounged up my Groovy In Action book, could not find my sed/awk book so went to the garage to find it.
me: spent some time digging in the garge for it.
me: found a lot of useful books
me: did not find my sed/awk book
me: came back out to the car, put my books in.
me: Wife had bundled up monkey-boy for camp and had left. they were running late, too, and left in a hurry.
me: Fortunately, my car key and wallet was already in my pants pocket and I had made special-effort to pull my badge out ofmy other pants.
me: my house/gate keys and my phone were inside the house. rendarkin: whew
me: so I pulled out my internet tablet, and used my wifi to IM my team to let them know I was running way late and had no phone
rendarkin: Good deal on the wifi communication!
me: that's when you first caught me. I was typing on a teeny tiny keyboard
rendarkin: heh
me: Wife will be amused
me: so, I got to work, and my sed/awk book is on my shelf as if it had been there yesterday, which it could have been given my fatigue and frame of mind.
me: I've got a stack of books I brought in anyway, because I think they apply to my work
me: but I am taking all of my books home...so I don't lose them in the move to the new building
me: yesterday evening was a good: A seemed really tired after camp, fell asleep under his bear until an hour into the sitter's time.
rendarkin: Awwww
me: we was fairly interactive yesterday evening
rendarkin: That's good. Interactive is good.