Draw
I finally wrestled CVS and Eclipse to a draw. I still have to dump some changes in (including grabbing the right postgresql.jar off the server, let me not forget on Monday), but I’ve got a branch to dump them into, based on 1.4 final with most of my changes from the beta.
And I have a much clearer mental model of CVS now, which is not a bad thing.
The last hurdle was sorting out why CVS repeatedly refused to import the jsp/local directory from my beta changeset. The handy-dandy .cvsignore file that CVSing the code from SourceForge puts in your jsp folder turned out to be the culprit—I hadn’t even known it was there.
But it hath been sorted, and on Monday I can go back to hacking the new code. I wouldn’t want to administer a complex project’s CVS for a living, though. Ugh. Just the thought makes my head hurt.