[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Suite branches



Hi all,

Following up on yesterday's meeting we should settle on a naming scheme for suite branches. My proposal (which already came up during the meeting) is to use $SUITE -- e.g. trixie-backports -- for the suite's master branch and $SUITE/pending-$CRATE for the pending branches. Unstable should probably be the exception, I don't see a strong need for changing master's and the pending-* branches names, but if you feel differently please say so.

As for experimental, I think yesterday we haven't decided if we want to have a separate branch for it. The biggest blocker I see there is unstable and experimental are not actually separate branches: exp can't live without unstable, so changes to unstable should be merged into exp, and the same is true in reverse whenever changes are first staged in exp and then downlifted to unstable. In a monorepo, however, one cannot do merges, only cherry-picks and checkouts, so having an exp branch means we would have to cherry pick/check out *a lot* (consider e.g. transitions where we first stage in exp). Essentially, this wouldn't be much different than having a single branch, as the two branches should still be kept in close sync.


In conclusion, I'd like to request for comments on:

1. $SUITE and $SUITE/pending-* as the naming scheme to be adopted, or alternative proposals,

2. making an exception for unstable and keep using master and pending-*,

3. whether or not we should have a separate exp branch, and if yes how to best manage syncing between the exp and the unstable branch.


Cheers!


Reply to: