From f0316f9347c37ad8c6140a154972c8a6771f0838 Mon Sep 17 00:00:00 2001 From: Carl George Date: Jul 26 2024 21:37:55 +0000 Subject: Add instructions for requesting branches to the Package Maintenance Guide --- diff --git a/modules/ROOT/pages/Package_Maintenance_Guide.adoc b/modules/ROOT/pages/Package_Maintenance_Guide.adoc index c248763..d531d89 100644 --- a/modules/ROOT/pages/Package_Maintenance_Guide.adoc +++ b/modules/ROOT/pages/Package_Maintenance_Guide.adoc @@ -303,17 +303,53 @@ fedpkg commit -p -c # commit and push in one go [#working_with_branches] == Working with branches -Each Fedora release is represented by a branch in the git repository. +Each Fedora and xref:epel::index.adoc[EPEL] release +has a corresponding branch in the git repository. You can switch between them like this: [subs="attributes+"] .... +fedpkg switch-branch rawhide fedpkg switch-branch f{MAJOROSVER} fedpkg switch-branch f{PREVIOUSOSVER} -fedpkg switch-branch rawhide +fedpkg switch-branch epel{MAJOREPELVER} +.... + +When the git repository is created, +it will only have a `rawhide` branch and a `main` branch, +the latter being an alias to the former. +Branches for new Fedora releases going forward are created automatically during +xref:infra:release_guide:sop_mass_branching.adoc[mass branching]. +If you would like to build your package for existing releases of Fedora or EPEL, +you will need to explictly request those branches. + +[#requesting_branches] +=== Requesting branches + +[subs="attributes+"] +.... +fedpkg request-branch f{MAJOROSVER} +.... + +This command will request a git branch for Fedora {MAJOROSVER}. + +[subs="attributes+"] +.... +fedpkg request-branch --all-releases +.... + +This command will request git branches for every currently active Fedora release. + +[subs="attributes+"] +.... +fedpkg request-branch epel{MAJOREPELVER} .... -The `rawhide` branch is for xref:releases::rawhide.adoc[Rawhide]. +This command will request a git branch for EPEL {MAJOREPELVER}. + +[#merging_between_branches] +=== Merging between branches + You can maintain each branch entirely separately, if you like, laboriously copying changes between them (so long as you always stay within the xref:fesco::Updates_Policy.adoc[Updates Policy] requirements).