Since Windows is hosed, I did the day's work from my Gentoo Linux partition. Today's primary task was getting the three copies of Cinemon (CVS, running CVS checkout and enhanced running CVS checkout on Win32) merged into one CVS repository after the loss of the original CVS repository (sigh). Secondary task was testing and making sure I hadn't screwed up the first task ;) .

Konqueror really needs some rethinking wrt usability. When I tell it to copy a directory into a directory where a similarly-named directory exists I'm either making a mistake or I'm wanting to merge the two directories. Give me the option. I love the SFTP support, though.

I really don't like that the left and right panes (directory tree and detailed list view) don't track each other. Means that I have to use the silly "up" or "back" arrows to do navigation. (To predict the argument; on an SFTP site, you could just display the tree as a sequence from the root to the current working directory so I can select a parent directory directly.)

Anyway, I eventually figured out how to get the two Unix-checkout directories to merge (cp -u being the key). After I spent what felt like a few hours cursing at the stupidity of having two different line-ending formats I eventually wound up doing a whitespace-insensitive diff between the win32 checkout and the combined unix checkout, manually replacing the ^M's throughout the diff and then applying it to the combined unix checkout. Other than 8 or nine files that were inexplicably showing weird last-modified dates, that took care of the merging.

Also did a few fixes to the codebase that let it work with Firefox + MozillaSVG. Unfortunately, Firefox + MozillaSVG turns out to be just as slow and buggy as the Mozilla Suite + MozillaSVG. I know, I know, I should just build from source with the bleeding edge MozillaSVG that has undoubtedly fixed all that, but honestly, I'm already building for source (Gentoo), how much more bleeding must I do?

Anyway, since Go Transit's lost and found has been either on the phone or not answering it all day I suppose I'll trek down to Union station in person to see if someone returned my poor lil' MEC bag before I wander over to the PyGTA meeting.

Unfortunately, since the PVR doesn't work on Linux with the ATI cards (regular readers will remember that I actually went out and bought an ATI TV Wonder just to have Linux PVR support then discovered that it was a new version that wasn't yet supported under Linux), and Windows is hosed, I'll miss both Smallville (not a huge loss, really), and This is Wonderland (which is rather disappointing).