I’m going to get back to posting here in just a bit with word of conference appearances (some overseas), plugin updates, and a small elegy, but first I need a little help with WordPress and subversion, if someone could spare the cycles to assist a newb. (Which would be me.)
So I have meyerweb’s WordPress install all subversion-managed. The only problem is that there are three core files I’ve had to hack (reasons upon request) and that makes updating really icky. I fire off…
svn sw http://svn.automattic.com/wordpress/tags/2.6.1/ .
…(where 2.6.1 is replaced with whatever the latest version is) and it updates everything. For my custom-altered files, though, I get diff files and a .mine file that has my old copy and then a copy that’s littered with diff markers, which cause PHP error-crashes, which takes down the site. At least until I go in and copy the .mine files over the diffed-up files.
So: how do I do some kind of local checkin of the altered files so that I don’t attempt to post them back to the WordPress codebase (these are very specialized hacks) but future WordPress updates don’t break my site? For extra ideal points, it would be great if those files were updated with my changes merged into the files. If it helps, the files thus affected are /wp-blog-header.php, /wp-includes/classes.php, and /wp-admin/edit-form-advanced.php. Thanks for any help!