After getting fed up of the Drupal upgrade process, I finally got around to building this diff generator which will generate an upgrade patch for any D6 upgrade path. Hopefully this page will make the Drupal upgrade process just that little bit easier. Though I really can't understand why Drupal themselves couldn't release proper diffs between versions rather than just bugfix diffs. It's an hour's work and could almost certainly be improved upon, it's also hard-coded for our server setup but will generate diffs which are usable for any Drupal-based system.
Usage: Choose your current version and the version you want to upgrade to and then click the button. The resulting code can then be used with patch -p5 in the root of your Drupal directory to upgrade cleanly. Don't forget to run update.php afterwards.
If we don't have the latest version of Drupal here yet then just add ?update=true to the end of this url and then reload.