Skip to content

Commit 885b276

Browse files
committed
Write down the procedure for merging an RFC.
1 parent e84cc62 commit 885b276

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

0000-template.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
- Start Date: (fill me in with today's date, YYYY-MM-DD)
1+
- Start Date: (fill in with date at which the RFC is merged, YYYY-MM-DD)
22
- RFC PR: [amaranth-lang/rfcs#0000](https://github.com/amaranth-lang/rfcs/pull/0000)
33
- Amaranth Issue: [amaranth-lang/amaranth#0000](https://github.com/amaranth-lang/amaranth/issues/0000)
44

README.md

+14
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,20 @@ While the RFC pull request is up, the subsystem maintainers may schedule meeting
9494

9595
The subsystem maintainer makes final decisions about RFCs after the benefits and drawbacks are well understood. These decisions can be made at any time, but the subsystem maintainer will regularly issue decisions. When a decision is made, the RFC pull request will either be merged or closed. In either case, if the reasoning is not clear from the discussion in thread, the subsystem maintainer will add a comment describing the rationale for the decision.
9696

97+
## Merging an RFC
98+
[Merging an RFC]: #merging-an-rfc
99+
100+
Once the decision is made to merge an RFC, the text must be prepared first. To do this:
101+
102+
- Update the RFC text to reflect any changes that had to be made to achieve consensus.
103+
- Ensure that the "Unresolved questions" section does not have any unanswered questions.
104+
- Create a tracking issue in the relevant repository.
105+
- Fill in the RFC header fields (start date, RFC PR, tracking issue).
106+
- Rename the RFC filename to include the number of the RFC PR instead of `0000`.
107+
- This step can be done either as a part of the merge commit in the next step, or by the RFC author right after submitting the PR.
108+
- Merge the RFC PR with the commit message "RFC #NNNN: Title of the RFC".
109+
- This step can only be done by someone with the write access to the RFC repository.
110+
97111
## Implementing an RFC
98112
[Implementing an RFC]: #implementing-an-rfc
99113

0 commit comments

Comments
 (0)