Okay is there a way to automatically pick up the changes at upgrade or is this a manual process regardless? using code diff tools? Only changes made through the admin interface (e.g. language defs, block layout, form creation etc will be saved but other code modifications will not be? Or is there a method using some kind of hook to pick up changes that are perhaps in a seperate file that is not going to be overwritten during upgrade?