...
- I keep two main patch files - basic_development.patch and basic_production.patch. Both patch files change the OFBiz configuration to work with our network environment, each one using settings chosen for the task - development or production. Only one patch is used at a time.
- I keep all of my custom development in a single folder under the ofbiz/applications hot-deploy folder. I avoid touching the trunk code at all costs - except for the configuration patches mentioned above.
- To keep my local copy updated, I do an SVN revert (to reverse the changes made by the patch), then an SVN update, then re-apply the patch. My custom development folder is untouched by the SVN commands, because SVN doesn't "know" about the folder.
...