...
Then, send in a patch file. This is a file which will describe all the differences between your modified code and the code in the OFBiz Subversion repository. You can create a patch file by using a command like thisPlease use the following conventions to name your patch.
The patch file name should be OFBIZ-number_featureDescription.patch where OFBIZ-number is the name of the Jira issue and featureDescription is full Jira issue title if it's small, or part of title if it's big.
You can create a patch file by using
- Command line
- Eclipse internal command
- A tool like Tortoise (on Windows only)
We prefer that you build your patch from the root as it's easier for commiters to merge your change. So please make your patch files from the OFBIZ_HOME directory (usually ofbiz/) and with relative file paths.
"Relative file paths" means tha in your patch file names should look like these :
applications/party/widget/partymgr/PartyScreens.xml
framework/webtools/config/WebtoolsErrorUiLabels.properties
and should not have file names like: C:\myfiles\ofbiz\applications\party\widget\partymgr\PartyScreens.xml
Exemples using command line:
Code Block |
---|
$ svn diffdi applications/product > productOFBIZ-number_featureDescription.patch |
will give us a patch file for all your changes in the applications/product sub-directory and save it as product.patch (it is a plain text file).
If you have added new files, then use the "add" command first, then make the diff
Code Block |
---|
$ svn add applications/product/<my-file> $ svn diffdi applications/product > productOFBIZ-number_featureDescription.patch |
You can also specify the exact files that you'd wish to include in your patch file, in case there are files that you have modified but do not wish to submit. For example, you can use
Code Block |
---|
$ svn status applications/product
|
to see which files have been modified (they start with an "M") or added (which start with a "?").
Then do:
Code Block |
---|
$ svn diffdi applications/product/entity/ applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml > productOFBIZ-shipmentnumber_featureDescription.patch |
if you only want to make a patch file of the entity/ sub-directory and the ShipmentServices.xml file.For consistency, please make your patch files from the OFBIZ_HOME directory (usually ofbiz/) and with relative file paths. Your patch file should have file names like:
applications/party/widget/partymgr/PartyScreens.xml
framework/webtools/config/WebtoolsErrorUiLabels.properties
and should not have file names like: C:\myfiles\ofbiz\applications\party\widget\partymgr\PartyScreens.xmlmake a patch file of the entity/ sub-directory and the ShipmentServices.xml file.
Make sure that the from/current revision of your local sandbox (checkout) is the current revision, or a very recent one, from the OFBiz SVN repository. The local revision can be checked by doing:
Code Block |
---|
$ svn info
|
To make sure you have the most recent revision always do an SVN update before doing the patch with svn diff, something like this:
Code Block |
---|
$ svn up
|
This must always be done before submitting a patch otherwise the patch just won't work. If your local sandbox is checked out from a separate SVN repository following the vendor branch pattern instead of directly from the OFBiz SVN, then you should do a vendor branch update, merge, and then local update in your sandbox before doing the svn diff to create the patch.
...