Skip to content

doc/src/backport_policy: init#2170

Open
trueNAHO wants to merge 1 commit intonix-community:masterfrom
trueNAHO:doc-src-backport-policy-init
Open

doc/src/backport_policy: init#2170
trueNAHO wants to merge 1 commit intonix-community:masterfrom
trueNAHO:doc-src-backport-policy-init

Conversation

@trueNAHO
Copy link
Copy Markdown
Member

Initialize a backport policy to avoid ambiguity and reduce maintenance
efforts.

Adding the backport policy was first mentioned in #2116 (review).

Here is the output of nix run .#doc:

image

@trueNAHO trueNAHO added the backport: release-25.11 To be backported to the release-25.11 stable branch label Jan 29, 2026
@stylix-automation stylix-automation bot added topic: documentation Documentation additions or improvements topic: ci /.github/ subsystem labels Jan 29, 2026
Comment thread .github/PULL_REQUEST_TEMPLATE.md Outdated
Comment on lines +6 to +9
To reduce maintenance efforts and improve stability on stable branches, security
and bug fixes are backported, while new features, modules, and theme
improvements are not backported. Specifically, upstream changes rendering themes
unreadable are considered a bug.
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the fact that ci changes should always be backported should be mentioned here. also we should decide on backporting document changes, recently we have been but i'm neutral on the matter.

Copy link
Copy Markdown
Member

@danth danth Feb 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should backport documentation because it improves usability. No code changes means it can't break existing configurations, so the branch is still stable. Of course, it's important to make sure that the features being documented do actually exist in the older version.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the fact that ci changes should always be backported should be mentioned here.

Good catch! I forgot to mention this.

also we should decide on backporting document changes, recently we have been but i'm neutral on the matter.

I think we should backport documentation because it improves usability. No code changes means it can't break existing configurations, so the branch is still stable. Of course, it's important to make sure that the features being documented do actually exist in the older version.

I am rather neutral about documentation backports, but what value would it provide besides potential LSP documentation improvements? Since the stable tree is already out-of-sync with the stable behavior, it seems unreliable to expect the /doc/ documentation to be accurately reflective.

Should documentation backports not only be restricted to pure documentation changes without behavior changes? Without manually cherry-picked backports, which this policy aims to reduce, the number of pure documentation changes (commits) to Nix options for the LSP seems fairly low.

Comment thread doc/src/backport_policy.md Outdated
Comment on lines +11 to +12
New modules and theme improvements may be backported when explicitly requested
and backporting is trivial.
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This paragraph conflicts with a previous statement:

To reduce maintenance efforts and improve stability on stable branches [...] new features, modules, and theme
improvements are not backported.

The expectation of a stable branch is generally that it only receives fixes to the existing feature set, as described above.

I'd suggest either changing our policy to fit that expectation, or explaining why this exception is appropriate.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This paragraph conflicts with a previous statement:

To reduce maintenance efforts and improve stability on stable branches [...] new features, modules, and theme
improvements are not backported.

The expectation of a stable branch is generally that it only receives fixes to the existing feature set, as described above.

That's the point. This is an additional constraint that acts as an exception to the previously mentioned default constraints. This is motivated by the fact that stable users commenting on unstable PRs for them to be backported happens more often than expected.

I'd suggest either changing our policy to fit that expectation, or explaining why this exception is appropriate.

Should we not keep the policy document concise and purely about the procedure without explaining its reasoning and motivation in great detail? The reasoning is already alluded with "when explicitly requested", and this exception seems justifiable unless the "backporting is trivial" condition does not hold.

Initialize a backport policy to avoid ambiguity and reduce maintenance
efforts.
@trueNAHO trueNAHO force-pushed the doc-src-backport-policy-init branch from 136b941 to 0d30f29 Compare February 2, 2026 15:25
@trueNAHO trueNAHO requested review from 0xda157 and danth February 20, 2026 22:36
Comment on lines +8 to +9
and theme improvements are not backported. Upstream changes rendering themes
unreadable are considered a bug.
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be more general. #2237 is good example of this.

Suggested change
and theme improvements are not backported. Upstream changes rendering themes
unreadable are considered a bug.
and theme improvements are not backported. Upstream changes causing theming
issues are considered a bug.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport: release-25.11 To be backported to the release-25.11 stable branch topic: ci /.github/ subsystem topic: documentation Documentation additions or improvements

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants