This should have been a fairly simple job, but it turns out that the repo and the server copy were completely out of sync, so I ended up overwriting a lot of stuff with old content from the repo; I had to retrieve it as best I could from the www-dev version. PS's local copy seems to have got completely out of sync with the repo. I've added all the latest versions from the site into the repo, which will make his local copy unsyncable until he's resolved all the conflicts.