Thanks BJ. I didn't realize that link was out there. I recently set up vendor branch management for our company and generally like using that approach. The only issue I have with it is that I haven't really found a good way to "selectively merge" the differences between revs. One of the main reasons for doing this is so you aren't tied to trunk and therefore can (theoretically) maintain a stable copy of the code. But when you do the merge you get all the changes. Obviously you still have control in the sense that you can test it before you deploy the new version. But some changes you may never want to accept, for example changes to the UI.
Any idea how to review and select what changes get merged? Vince Clark www.globalera.com [email protected] (303) 493-6723 office (303) 523-4843 cell ----- Original Message ----- From: "BJ Freeman" <[email protected]> To: [email protected] Sent: Saturday, August 1, 2009 7:10:48 AM GMT -07:00 US/Canada Mountain Subject: Re: Recommendation for how to handle workspace with "processing" contributions opps http://docs.ofbiz.org/display/OFBIZ/SVN+Tips+-+svn_load_dirs+Vendor+Branch BJ Freeman sent the following on 7/31/2009 5:24 PM: > take a look at this > also name your patches for the jira number and component or file it > effects. that way it is easy to update them. > > Bob Morley sent the following on 7/31/2009 3:47 PM: >> While I have been working on Ofbiz for a while, I have not made a good enough >> effort to contribute back bug fixes and enhancements that I feel would be >> valuable to the product. I have started to do this, but I have a question >> about how people handle their workspace while they are waiting for >> contributions to be approved/rejected. >> >> I have created a few JIRAs and attached patch files to them for my changes. >> However, as I do more and more work I end up with more and more changes in >> my workspace that are updated. It will ultimately become very difficult to >> determine which files I should include in the next patch; moreover I may >> result in dependencies. >> >> Does any non-contributor (or contributor for that matter) have a suggestion >> on how to manage this? I am thinking about using Mylyn and the JIRA >> integration to relate the files. This does not help the patch generation >> ... >> >> Anyone have a better suggestion? > -- BJ Freeman http://www.businessesnetwork.com/automation http://bjfreeman.elance.com http://www.linkedin.com/profile?viewProfile=&key=1237480&locale=en_US&trk=tab_pro Systems Integrator.
