*sigh*

So I'm working on testing the Merge From Hell (TM) and spent a moderate amount of time tracing down a goof/typo that I made at one point while trying to clean up the changes to the session IDs. I think that's better now.

But I also have some of my old test code that I want to try out in the app and it turns out that one of the other programmers in the group decided it was useless and deleted it without telling me. Now the good news is that the code was still in source control; the bad news was that ClearCase was stubbornly refusing to let me get it back in the projects I needed it in, because it recognized that the files had been deleted.

Fortunately, this can be fixed if you're using ClearCase instead of CCRC. And my boss had real ClearCase available, so he and I sat down this afternoon and sorted it out.

Now I just need to get the test code to compile in this environment.