How to update from 1.4 to 1.5 if did modification in 1.4 ?

My website is running on 1.4 version, i never removed anything from 1.4 version but i added 3 fields in product table in database, added few stored procedures, little changes in display and did some changes with order invoices , paypal invoice etc, so in short i did some modifications in 1.4 version

In my situation how to upgrade from 1.4 version to 1.5 version ?

there is a sacreencast for this, but i know you made changes to files so,

make sure everything is backed up, run the UPGRADE scripts over your database

apply the changes you made to v1.4 files    to your 1.5 files   (check your resourceStrings as you go to help resolve the issues you have been having) and upload your 1.5 files (might be an ide to do this into a new folder on your server)


remember to make backups before you start

If you haven't used this before, it is invaluable for this situation:

http://winmerge.org/

Thanks for your suggestions guys, i will see what i can do in order to upgrade from 1.4 to 1.5