Piecuu/pmaports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

docs/merging-rules: update backporting information

Browse source 
We haven't released service packs in years, so there's no point to
document them as a process.

Part-of: <https://gitlab.postmarketos.org/postmarketOS/pmaports/-/merge_requests/7077>
This commit is contained in:
Pablo Correa Gómez 2025-09-25 08:38:27 +02:00 • committed by The Friendly Merge Bot
parent c42e5e9a32
commit 3c19b268c2
No known key found for this signature in database
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
docs/modules/ROOT/pages/merging-rules.adoc
View file

@ -36,13 +36,13 @@ cases, before merging, in addition to the regular approvals, it is required to:
== Backporting ==
Backporting features from pmaports edge to stable is done in service packs. So
the new feature has some additional testing time in edge, before it potentially
breaks something in stable.
Backporting features from edge to stable is done at request of the MR author or
package maintainer. All patches for stable branches must go through edge first
and get backported from there to get additional testing before they potentially
breaks something in stable. The only exception are patches for failures that
only happen on stable.
Critical fixes can be backported immediately, after proper testing to make sure
that there is no breakage.
All patches for stable branches must go through edge first and get backported
from there. The only exception are patches that fix build failures that only
happen on stable.
Only some members of the team are allowed to push to stable branches. To get a
patch backported to stable, label the MR with the corresponding `backport-to-v*`
label, and request a Core Contributor to cherry-pick it. Cherry-picking should
be done using `-x` option, to make sure that the original commit is mentioned.