This policy was provisionally accepted by the network team on 14 October 2019. It became non-provisional on 14 January 2020.
This policy was provisionally accepted by the network team on 14 October 2019. It became non-provisional on 14 January 2020.
For information on '''how''' to merge, see the [[org/teams/NetworkTeam/MergeProcess|MergeProcess]] document.
For information on **how** to merge, see the [[org/teams/NetworkTeam/MergeProcess|MergeProcess]] document.
== SCOPE ==
## SCOPE
This policy describes when we merge things to the main tor.git repository, and to other repositories owned by the network team.
This policy describes when we merge things to the main tor.git repository, and to other repositories owned by the network team.
...
@@ -17,7 +17,7 @@ It describes:
...
@@ -17,7 +17,7 @@ It describes:
* How many people must approve each merge.
* How many people must approve each merge.
== THE GENERAL RULE ==
## THE GENERAL RULE
In general, every branch should be reviewed and approved by somebody other than the author before it is merged.
In general, every branch should be reviewed and approved by somebody other than the author before it is merged.
...
@@ -25,7 +25,7 @@ In other words, you can merge your own commits if somebody else has reviewed and
...
@@ -25,7 +25,7 @@ In other words, you can merge your own commits if somebody else has reviewed and
There are exceptions to this rule, listed below.
There are exceptions to this rule, listed below.
== REQUESTING ADDITIONAL REVIEW ==
## REQUESTING ADDITIONAL REVIEW
If the author or reviewer of a branch believes that it needs an additional reviewer, they should mark it as such, by saying so on the ticket, and by marking the ticket with "extra-review". (Additionally, telling people on IRC is also encouraged.)
If the author or reviewer of a branch believes that it needs an additional reviewer, they should mark it as such, by saying so on the ticket, and by marking the ticket with "extra-review". (Additionally, telling people on IRC is also encouraged.)
...
@@ -42,7 +42,7 @@ Additional review is always required for any security patch that we intend to ke
...
@@ -42,7 +42,7 @@ Additional review is always required for any security patch that we intend to ke
For nontrivial contributions from external volunteers, additional review is strongly recommended.
For nontrivial contributions from external volunteers, additional review is strongly recommended.
== OLDER BRANCHES ==
## OLDER BRANCHES
Stable branches have backport maintainers. Only the designated backport maintainers for a particular branch should normally merge to it.
Stable branches have backport maintainers. Only the designated backport maintainers for a particular branch should normally merge to it.
...
@@ -78,11 +78,11 @@ The following items do not need a reviewer or a separate merger:
...
@@ -78,11 +78,11 @@ The following items do not need a reviewer or a separate merger:
* Editing a changes file.
* Editing a changes file.
== WHEN NOT TO MERGE ==
## WHEN NOT TO MERGE
For a day or two before a release, please do not merge anything at all into the release's branch without first checking with the release manager.
For a day or two before a release, please do not merge anything at all into the release's branch without first checking with the release manager.
== WHAT TO CHECK BEFORE MERGING ==
## WHAT TO CHECK BEFORE MERGING
These issues are hard to notice (or hard to fix) after merging, so PLEASE be sure that you check them first.
These issues are hard to notice (or hard to fix) after merging, so PLEASE be sure that you check them first.
...
@@ -92,7 +92,7 @@ These issues are hard to notice (or hard to fix) after merging, so PLEASE be sur
...
@@ -92,7 +92,7 @@ These issues are hard to notice (or hard to fix) after merging, so PLEASE be sur
* Is there a spec branch corresponding to any protocol change?
* Is there a spec branch corresponding to any protocol change?
Also, PLEASE check to make sure that all [https://gitweb.torproject.org/tor.git/tree/doc/HACKING/Maintaining.md#n80 pre-review requirements] are really satisfied.
Also, PLEASE check to make sure that all [pre-review requirements](https://gitweb.torproject.org/tor.git/tree/doc/HACKING/Maintaining.md#n80) are really satisfied.
