I managed to merge the new version with the various hacks and my own tweaks (good old CVS). It seems to work OK.
Unfortunately, for ease of use, I had ftp-ed my whole repository onto my local machine, did the merge there, committed my changes, tar-gzipped it back up with cygwin‘s tar and ftp-ed it back to my server. At which point it refused to untar as the UID and GID values are different from those on my server. As I don’t have root on my server :-), I don’t know what to do about it. I could ftp each file individually, but I really don’t want to do that if I can avoid it.
Short link to this post: https://z1.tl/tl