Comment 15 for bug 1023047

2.) only gives you problems if just the changed file is changed at that specific position. that's not very likely

Still, our (the community's) idea is just to have standard OpenERP with the bugfixes we (the community) consider important on top of it. Which is what ocb-addons is. Read that: https://launchpad.net/ocb-addons

4.) is not an option at all, don't do that.

Do your reading on https://launchpad.net/ocb-addons and post any further questions there in the answers section, I think 3.) is your way to go.