blob: 4606da5f19ef91cb3ea3317bad7b051e1298d365 [file] [log] [blame] [view]
jfarrell347a5eb2014-04-05 12:20:07 -04001## Process used by committers to review and submit patches
2
31. Make sure that there is an issue for the patch(s) you are about to commit in our [Jira issue tracker]({{ conf.jira_url }})
4
51. Check out the latest version of the source code
6
7 * git clone https://git-wip-us.apache.org/repos/asf/thrift.git thrift
8
91. Apply the patch
10
11 * curl https://issues.apache.org/jira/... |git apply --ignore-space-change
12
13 or
14
15 * curl https://github.com/<GitHub User>/thrift/commit/<Commit ID>.patch |git apply --ignore-space-change
16
17
181. Inspect the applied patch to ensure that all [Legal aspects on Submission of Contributions (Patches)](http://www.apache.org/licenses/LICENSE-2.0.html#contributions) are met
19
201. Run the necessary unit tests and cross language test cases to verify the patch
21
221. Commit the patch
23
24 git --config user.name "Your Name"
25 git --config user.email "YourApacheID@apache.org"
26 git add -A
27 git commit
28
29
301. The commit message should be in the format:
31
32 THRIFT-###:<Jira description>
33 Client: <component>
34 Patch: <Name of person contributing the patch>
35
36 Description of what was fixed or addressed.
37
38 <%
39 if this is a github pull request then copy the below block
40 from the GitHub email that came to dev@ list, this will
41 automatically close the GitHub pull request
42 %>
43 Github Pull Request: This closes #XX
44 ----
45 commit 1234567
46 Author: docbrown <docbrown@example.com>
47 Date: 1985-06-03T01:21:00Z
48
49 fix for THRIFT-1234
50
51 fix for THRIFT-1234 fixes the flux capacitor
52
53
541. Double check the patch committed and that nothing was missed then push the patch
55
56 git status
57 git show HEAD
58 git push origin master
59
60
611. Resolve the jira issue and set the following for the changelog
62
63 * Component the patch is for
64 * fixVersion to the current version on master
65
66
67