[galaxy-dev] Recommended process for updating local Galaxy instance

I'm wanting to update our local instance of Galaxy to the most recent in mercurial. Before I do I'd like to know if there's a consensus on how best to do this. At the moment, I do an 'hg pull' and then an 'hg update'. Once complete I use 'diff' to check for any important changes to tools_conf.xml and universe_wsgi.ini and migrate them to my versions of the files. Is this a flawed approach or is there a better way to do it? Any advice appreciated. Cheers, Chris