When I update from CVS, I get a number of conflicts from files that are obviously related to S2. (Example: cvs update: move away LJ/S2/FriendsPage.pm; it is in the way). If I delete those files and then update from CVS, I don't get the conflicts anymore, but the server completely stops working after a restart. (Internal Server Error.) If I update from the Danga repository thing and copy all the S2-related files from there, the server works again after a restart, but CVS-updating gives me the conflicts again. How can I solve this?
I've tried testing Avva's patch here - however, the added priv never shows up on my server. update-db.pl gives me the following message:
# Warning: unknown live table: s2style
update-db.pl -p produces this:
Populating public system styles (S2):
Undefined subroutine &LJ::S2::get_public_layers called at bin/upgrading/update-db.pl line 170.
How can I solve this?
Thanks in advance for any help you can give.