lix-project/lix

Fork 31

meta bug: backport docs prs #163

New issue

Open

opened 2024-03-19 17:00:34 +00:00 by jade · 3 comments

jade commented

2024-03-19 17:00:34 +00:00

Owner

this is a very not specific bug.

the docs pr list here has not been very seriously considered for picking, and this should change.

(please mark ones you've picked as you go) https://pad.lix.systems/7NJ31SVPTBGqeDP1HCoiEw#

!! warning !! these are spaghetti merged, by rebase or squash or merge commit. you will want to fix my pr backport script CL (https://gerrit.lix.systems/c/lix/+/494) to probably hit the gh api to get the commit list in the pr, possibly use git-revise somehow to generate a squashed commit on top of the original base in nix master, then cherry pick it to main here in a CL.

the reason to do that is that we absolutely do not expect good commit hygiene from upstream prs because it was not necessary in a gh like model, and spaghetti commits will make it hard to handle merge conflicts.

sorry. it's a lot of work.

this is a very not specific bug. the docs pr list here has not been very seriously considered for picking, and this should change. (please mark ones you've picked as you go) https://pad.lix.systems/7NJ31SVPTBGqeDP1HCoiEw# !! warning !! these are spaghetti merged, by rebase or squash or merge commit. you will want to fix my pr backport script CL (https://gerrit.lix.systems/c/lix/+/494) to probably hit the gh api to get the commit list in the pr, possibly use git-revise somehow to generate a squashed commit on top of the original base in nix master, then cherry pick it to main here in a CL. the reason to do that is that we absolutely do not expect good commit hygiene from upstream prs because it was not necessary in a gh like model, and spaghetti commits will make it hard to handle merge conflicts. sorry. it's a lot of work.

jade added the

docs

label 2024-03-19 17:00:34 +00:00

jade added this to the Release engineering project 2024-03-19 17:00:34 +00:00

pennae commented

2024-03-19 17:09:55 +00:00

Owner

the docs prs in the list seem mostly good from a content point of view (unless there's anything about fetchTree in there, and there's a few of those). the problem we were ignoring is not just the spaghetti merges you mentioned, but also that a bunch of build infra divergence has happened that made picking docs prs a real pain in the tail. many of them have to be re-edited.

jade added the

E/help wanted

label 2024-03-25 04:46:59 +00:00

jade commented

2024-03-25 04:47:25 +00:00

Author

Owner

@pennae can you set that specific pad to freely, so external contributors can help?

jade added this to the v2.90 milestone 2024-03-25 04:51:29 +00:00

pennae commented

2024-03-25 12:35:54 +00:00

Owner

@pennae can you set that specific pad to freely, so external contributors can help?

should be freely now

> @pennae can you set that specific pad to freely, so external contributors can help? should be freely now

jade modified the milestone from v2.90 to post-release

2024-08-13 01:19:27 +00:00

No milestone

No project

No assignees

2 participants

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: lix-project/lix#163

No description provided.