... | ... | @@ -4,7 +4,7 @@ |
|
|
|
|
|
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 [MergeProcess](./MergeProcess) document.
|
|
|
|
|
|
## SCOPE
|
|
|
|
... | ... | @@ -59,7 +59,7 @@ Generally, any patches that are merged into a stable branch should first be test |
|
|
|
|
|
Nobody should merge anything to an obsolete branch.
|
|
|
|
|
|
== WHEN IS REVIEW NOT NEEDED ==
|
|
|
## WHEN IS REVIEW NOT NEEDED
|
|
|
|
|
|
The following items do not need a reviewer or a separate merger:
|
|
|
|
... | ... | @@ -86,17 +86,17 @@ For a day or two before a release, please do not merge anything at all into the |
|
|
|
|
|
These issues are hard to notice (or hard to fix) after merging, so PLEASE be sure that you check them first.
|
|
|
|
|
|
* Is there a changes file?
|
|
|
* Is there a changes file?
|
|
|
|
|
|
* Is the patch based against the correct branch?
|
|
|
* Is the patch based against the correct branch?
|
|
|
|
|
|
* 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 [pre-review requirements](https://gitweb.torproject.org/tor.git/tree/doc/HACKING/Maintaining.md#n80) are really satisfied.
|
|
|
|
|
|
== OTHER NOTES ==
|
|
|
## OTHER NOTES
|
|
|
|
|
|
All mergers should make sure they are [[org/teams/NetworkTeam/MergeProcess|using our scripts and git hooks]].
|
|
|
All mergers should make sure they are [using our scripts and git hooks](./MergeProcess).
|
|
|
|
|
|
The merger should, if possible, be on IRC when they're merging things.
|
|
|
|
... | ... | |