Click and Swear (Redux)

So I'm on the latest massive code merge for my project. Because I wasn't allowed to merge my code onto the mainline, I'm now looking at 400+ manual changes to complete this merge. Each of these pops up at a rate of about one per minute. I then perform four mouse clicks and wait for the next pop up. Sometimes, the merge is slightly more complex, but that's only about ten percent of the files.

Doing anything that requires thought while working on this is pretty difficult. Well, any thought that can't be either paused or broken up into one minute chunks.

So mostly I'm catching up on my light reading on the web. And I checked in four or five six or seven changes while working on this post.

One more merge after this one and then I can actually get back to doing some real work.

Click and Swear (Redux)

So I'm on the latest massive code merge for my project. Because I wasn't allowed to merge my code onto the mainline, I'm now looking at 400+ manual changes to complete this merge. Each of these pops up at a rate of about one per minute. I then perform four mouse clicks and wait for the next pop up. Sometimes, the merge is slightly more complex, but that's only about ten percent of the files.

Doing anything that requires thought while working on this is pretty difficult. Well, any thought that can't be either paused or broken up into one minute chunks.

So mostly I'm catching up on my light reading on the web. And I checked in four or five six or seven changes while working on this post.

One more merge after this one and then I can actually get back to doing some real work.

And Then the Other Shoe Dropped

I came back from dinner at Sweet Tomatoes with daisy_knotwise, Katie, and Julie and resumed the earlier clicking and swearing at the nearly 500 files that needed manual merging in ClearCase. And, at last, I finished!

And then I discovered that someone had added a new project to the source tree. My view sees it as empty. Update Resource does not fix this. Restore Resource does not fix this.

Unfortunately, I know from what I just merged that there should be files in the new project. And without them, I can't compile this mess to see how the merge did.

So I've sent an e-mail to our ClearCase expert for help, but he won't be in until at least 9 AM Pacific Time.

*sigh*

And Then the Other Shoe Dropped

I came back from dinner at Sweet Tomatoes with daisy_knotwise, Katie, and Julie and resumed the earlier clicking and swearing at the nearly 500 files that needed manual merging in ClearCase. And, at last, I finished!

And then I discovered that someone had added a new project to the source tree. My view sees it as empty. Update Resource does not fix this. Restore Resource does not fix this.

Unfortunately, I know from what I just merged that there should be files in the new project. And without them, I can't compile this mess to see how the merge did.

So I've sent an e-mail to our ClearCase expert for help, but he won't be in until at least 9 AM Pacific Time.

*sigh*

Preschool Logic

The most recent development in the relationship between Katie and her favorite blanket, Badi, is that Badi now sleeps on a pillow on her bed, covered by a second blanket. I'm assuming this keeps Badi from getting cold, because we have been told in the past that Badi is cold.

Katie, of course, is never cold.

Preschool Logic

The most recent development in the relationship between Katie and her favorite blanket, Badi, is that Badi now sleeps on a pillow on her bed, covered by a second blanket. I'm assuming this keeps Badi from getting cold, because we have been told in the past that Badi is cold.

Katie, of course, is never cold.

Scrubbing the Launch

I've been trying for some time now to figure out how to get daisy_knotwise, Katie, and Julie down to GAFilk. The problem is that Gretchen doesn't really want to go through a two-day drive to get there (not to mention putting Katie and Julie through it) and then end up feeling like she's imposing on anyone who might be willing to watch the girls for us. And the deadline for the hotel block is rapidly approaching. So I brought it up again tonight.

And Gretchen pointed out that Christmas is the weekend after this. Then there's New Year's, then there's GAFilk, then catalana is coming up to visit for a weekend, then there's Confusion, then ladyat is coming up to record the last of the drum tracks for Juanita's album, then we skip a week (during which I will mostly ignore the Super Bowl), and then we arrive at Capricon, for which I actually have to do something about a filk track while we also handle the Dodeka table. And a few weeks after that, I head out to Consonance and a one-day meeting with the folks I work with in the Bay Area.

"Don't you think we really need GAFilk weekend at home?"

Well, yeah.

So we'll be skipping GAFilk this year.

Maybe next year.

Scrubbing the Launch

I've been trying for some time now to figure out how to get daisy_knotwise, Katie, and Julie down to GAFilk. The problem is that Gretchen doesn't really want to go through a two-day drive to get there (not to mention putting Katie and Julie through it) and then end up feeling like she's imposing on anyone who might be willing to watch the girls for us. And the deadline for the hotel block is rapidly approaching. So I brought it up again tonight.

And Gretchen pointed out that Christmas is the weekend after this. Then there's New Year's, then there's GAFilk, then catalana is coming up to visit for a weekend, then there's Confusion, then ladyat is coming up to record the last of the drum tracks for Juanita's album, then we skip a week (during which I will mostly ignore the Super Bowl), and then we arrive at Capricon, for which I actually have to do something about a filk track while we also handle the Dodeka table. And a few weeks after that, I head out to Consonance and a one-day meeting with the folks I work with in the Bay Area.

"Don't you think we really need GAFilk weekend at home?"

Well, yeah.

So we'll be skipping GAFilk this year.

Maybe next year.