Skip to content

Commit 8477c60

Browse files
authored
Merge pull request #486 from garlick/rfc1_reality_check
align RFC 1 with current project practice
2 parents af05fab + 1920e8c commit 8477c60

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

spec_1.rst

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ Related Standards
3333
- :doc:`spec_2`
3434
- :doc:`spec_7`
3535
- :doc:`spec_47`
36+
- :doc:`spec_48`
3637

3738
Goals
3839
*****
@@ -153,22 +154,16 @@ Development Process
153154

154155
- To accept or reject a patch, a Maintainer SHALL use the Platform interface.
155156

156-
- Maintainers SHOULD NOT merge their own patches except in exceptional cases, such as non-responsiveness from other Maintainers for an extended period (more than 1-2 days).
157+
- Maintainers SHOULD NOT merge their own patches except in exceptional cases.
157158

158-
- Maintainers SHALL NOT make value judgments on correct patches.
159+
- Maintainers SHALL merge correct patches from other Contributors as described in :doc:`spec_48`.
159160

160-
- Maintainers SHALL merge correct patches from other Contributors rapidly.
161+
- The Contributor MAY add a "WIP" prefix to a pull request title or use the platform to select "draft" to indicate that a pull request is not yet ready for review.
161162

162-
- The Contributor MAY tag an issue as "Ready" after making a pull request for the issue.
163-
164-
- The user who created an issue SHOULD close the issue after checking the patch is successful.
163+
- The user who created an issue SHOULD close the issue after a patch solving the issue has been merged.
165164

166165
- Maintainers SHOULD ask for improvements to incorrect patches and SHOULD reject incorrect patches if the Contributor does not respond constructively.
167166

168-
- Any Contributor who has value judgments on a correct patch SHOULD express these via their own patches.
169-
170-
- Maintainers MAY commit changes to non-source documentation directly to the project.
171-
172167
- Autotools products, if applicable, SHOULD NOT be checked into the project
173168
revision control system
174169

@@ -187,7 +182,7 @@ Release Process
187182
Creating Stable Releases
188183
========================
189184

190-
- The project SHALL have one branch ("master") that always holds the latest in-progress version and SHOULD always build.
185+
- The project SHALL have one branch (that SHOULD be named "main") that always holds the latest in-progress version and SHOULD always build.
191186

192187
- The project SHALL NOT use topic branches for any reason. Personal forks MAY use topic branches.
193188

0 commit comments

Comments
 (0)