Info | ||
---|---|---|
| ||
After the svn tag "beforeSvnRestructuring" the repository strcture structure has changed, please refer to history for information before this tag |
...
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
Handling deprecated services
We tag code deprecated as a part of a release and these code will be removed from next release.
Lets say we set Release 17.XX as deprecated for a service, this service will be part of Release17.XX and will be removed in next Release 18.XX
Imagine we are the 30 december 2019 and we decide to create a new release.
We have on trunk :
- addCatalogMember deprecated since="next release"
- deleteWorkEffortAssignment deprecated since="18.12"
We prepare the release, we have on trunk :
- addCatalogMember deprecated since="19.12"
- deleteWorkEffortAssignment deprecated since="18.12"
We create the stable branche, and after clean the trunk. Now on trunk we have :
- addCatalogMember deprecated since="19.12"
An so on...
Following changes
Manage JIRA's issues
...