I decided to try Subversion out some more, and made it so Trinity’s live-dev and my offline-dev are both working from files from the same repository. Instead of FTPing all the files over to Trinity every time I make some changes (and I usually have to reupload all of them, since I can never remember which files I’ve changed), I can just commit them on my laptop, which uploads the changed files to the repo, and then checkout on Trinity’s version and every thing’s back up-to-date.

The one problem I’m having though is that Trinity’s version has a completely different password for the database than my local version does. In the past I’ve just never overwritten the database.php file, so both have the right password, but now all the changes are uploaded, so are the different passwords!

I need some way of saying “don’t commit the database file”. Or at even better, “don’t change this one line”.