Wolfgang Schweer schreef op zo 05-09-2021 om 00:32 [+0200]: > [ Holger Levsen, 2021-09-04 ] > > so after some thinking this is my plan for debian-edu-doc: > > > > 1a. we add the manual for bookworm to the main branch (master) of > > debian-edu-doc > > and we keep the manual for buster (and bullseye of course) in that > > branch > > too. > > > > 1b. we upload that branch to unstable and let it migrate to bookworm. > > > > 1c. in a year, when buster becomes LTS, we drop the buster manual from > > the > > main branch. > > > > 2a. a bullseye branch is forked from the main branch at > > 7b8eae644ada0e3eb9ce060ed1f0a139454dc1cc > > > > 2b. the manual and the translations for both bullseye and buster are > > updated by copying files from the main branch. (as opposed to > > cherry-picking.) > > > > What do you think? Anything I missed? (Except new translations for > > bullseye, > > about which I'm not fully sure yet...) > > For me, this is a very good and complete plan. > > Wolfgang Agreed. I would like to also raise one other point: Over the bullseye release cycle, master and weblate have each built their own git histories. Now that we're starting a new release cycle, I would like to realign weblate's history with master's history (If I'm correct, the following commands would do the trick: git checkout weblate ; git reset --hard weblate master ; git push -f). Does anyone have an objection? Frans
Attachment:
signature.asc
Description: This is a digitally signed message part