Rule of Shared Repository » 履歴 » バージョン 10
kaoru n, 2014-10-21 13:19
1 | 1 | Kousuke Ebihara | h1. Rule of Shared Repository |
---|---|---|---|
2 | |||
3 | h2. Overview |
||
4 | |||
5 | This document provides rule of handling shared repository of developing OpenPNE3. |
||
6 | |||
7 | Everyone must follow this rule to handle the shared repository. |
||
8 | |||
9 | 10 | kaoru n | h2. Shared Repository |
10 | |||
11 | <pre> |
||
12 | git://github.com/openpne/OpenPNE3.git |
||
13 | </pre> |
||
14 | |||
15 | h2. Branches |
||
16 | |||
17 | Branches of the shared repository must limit the release branches (they contain the master branch). Don't push a branch for your work. You should create such a branch to your repository. |
||
18 | |||
19 | h2. Master Branch |
||
20 | |||
21 | In the master branch of the shared repository, to merge bug fixes and feature additions to the development version. |
||
22 | |||
23 | h3. 'stable-3.x.x' Branch |
||
24 | |||
25 | It is a branch of the order to carry out maintenance of the stable version (such as bug fixes). |
||
26 | When bug fixed, attach a tag to a specific revision of this branch, it will be released. |
||
27 | |||
28 | 6 | Kousuke Ebihara | h2. "push" privilege to handle shared repository |
29 | 1 | Kousuke Ebihara | |
30 | 9 | Rimpei Ogawa | GitHub accounts that are in the following list, can execute "push" operations to shared repository (as of Jun 23, 2014): |
31 | 1 | Kousuke Ebihara | |
32 | 6 | Kousuke Ebihara | * "balibali":https://github.com/balibali |
33 | 1 | Kousuke Ebihara | * "martini2002jp":https://github.com/martini2002jp |
34 | 9 | Rimpei Ogawa | * "nishizoe":https://github.com/nishizoe |
35 | 6 | Kousuke Ebihara | * "ShinichiU":https://github.com/ShinichiU |
36 | * "tejima":https://github.com/tejima |
||
37 | * "upsilon":https://github.com/upsilon |
||
38 | 1 | Kousuke Ebihara | |
39 | 9 | Rimpei Ogawa | If you think that you are worthy of getting "push" privilege, please tell your GitHub account to balibali, nishizoe, ShinichiU, or tejima. |
40 | 1 | Kousuke Ebihara | |
41 | h2. Committing |
||
42 | |||
43 | h3. Direct Committing |
||
44 | |||
45 | Committing direct is not allowed excepting few cases. |
||
46 | |||
47 | Release Manager can directly commit when he works for releasing. |
||
48 | 2 | Kousuke Ebihara | |
49 | 1 | Kousuke Ebihara | In other cases, anyone must work in his own clone. |
50 | |||
51 | h3. Commit Messages |
||
52 | |||
53 | In merging, commit messages must follow the following rule: |
||
54 | * A message must be written in English. A message can contain other languages, but that must be explained in English. |
||
55 | * A message must contain related ticket ID. The ID must be specified with "refs" or "fixes" keyword. We have useful hook script for keeping it: http://gist.github.com/202866 |
||
56 | e.g. "Added ability to delete member from the mobile_backend application (refs #1)", "Added ability to configure gadgets from the mobile_backend application. Adding support to manage SNS from mobile is now completed. (fixes #1)" |
||
57 | * A message must tell everyone what the commit is. |
||
58 | |||
59 | A commit that doesn't follow this rule, most likely is rejected. |
||
60 | 3 | Kousuke Ebihara | |
61 | 5 | Kousuke Ebihara | h2. Merging |
62 | |||
63 | 10 | kaoru n | It merge after the test is complete. |
64 | Change a status of the related ticket to "Fixed".(Changing status is doing automatically if a commit is related with a ticket by the "fixes" keyword in its message) |