Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: Adds a section about how committers should handle backporting

...

  1. Make sure the contribution is posted publicly on the Apache OFBIZ JIRA issue tracker. Please do not commit changes that were sent to you privately. If you receive a patch, open a JIRA issue and then ask the submitter to post his patch there. This way, we can avoid having to get an iCLA for the contributor, as well as let everybody in the community view and comment on the contribution.
  2. If it is a new file, the file must have the Apache 2.0 license header.
  3. The commit log must identify the name of the contributor and, if relevant, the JIRA issue for it.

How should new committers handle backporting?

Christian Carlow asked

Should committers download the entire ofbiz repository to help with backporting?

Here is Jacopo Cappellato's answer:

It is easier if you keep the trunk and the release branches in different svn folders (i.e. different checkouts); for example:

mkdir ofbiz
cd ofbiz
svn co https://svn.apache.org/repos/asf/ofbiz/trunk
svn co https://svn.apache.org/repos/asf/ofbiz/branches/release14.12
svn co https://svn.apache.org/repos/asf/ofbiz/branches/release13.07
svn co https://svn.apache.org/repos/asf/ofbiz/branches/release12.04
svn co https://svn.apache.org/repos/asf/ofbiz/site

You will end up with the following folder layout:

ofbiz/
ofbiz/trunk
ofbiz/release14.12
ofbiz/release13.07
ofbiz/release12.04
ofbiz/site

Is there a standard procedure new committers should follow for backporting?

Only bugs should be backported to active release branches (if they happen also there); it is not mandatory that you do but it is very much appreciated! Here is a simple workflow to backport a commit to a branch. 

1) commit the fix to trunk and note down the commit id; e.g. rev 12345
2) go to the release branch you want to backport to; e.g. cd ofbiz/release14.12
3) run the following script (the script will apply the commit to your local release branch): ./tools/mergefromtrunk.sh/bat merge 12345
4) run the tests with: ./tools/mergefromtrunk.sh/bat test
5) it is also a good idea to start the instance and test manually
6.a) if tests are unsuccessful, abort the process and clean your local release branch: ./tools/mergefromtrunk.sh/bat abort
6.b) if tests are successful, and you want to commit the backport: ./tools/mergefromtrunk.sh/bat commit

Following changes

Manage JIRA's issues

...