From ba6d7b28f01a1699328ddf83ce309dcb0be02bf3 Mon Sep 17 00:00:00 2001 From: Otto Liljalaakso Date: Aug 13 2024 09:24:59 +0000 Subject: Remove duplicate instructions for requesting branches Requesting dist-git branches was covered in multiple places. To avoid maintaining the same information in multiple places, retain one location, extend it with additional information from other places, and replace other places with links. This is a follow up for f0316f9347c3 from #165 where the new location, intended to be the main source, was added. --- diff --git a/modules/ROOT/pages/New_Package_Process_for_Existing_Contributors.adoc b/modules/ROOT/pages/New_Package_Process_for_Existing_Contributors.adoc index 87f75b4..c0c081a 100644 --- a/modules/ROOT/pages/New_Package_Process_for_Existing_Contributors.adoc +++ b/modules/ROOT/pages/New_Package_Process_for_Existing_Contributors.adoc @@ -56,7 +56,7 @@ before being able to successfully request the repo. ** When the repo is created, it only contains the `rawhide` branch. If you want to bring the package to other Fedora releases, -request branches with `fedpkg request-branch --repo PACKAGE-NAME BRANCH`. +see xref:Package_Maintenance_Guide.adoc#requesting_branches[Requesting branches]. . Once the requests have been processed, checkout the distgit repository with `fedpkg clone `. diff --git a/modules/ROOT/pages/New_Package_Process_for_New_Contributors.adoc b/modules/ROOT/pages/New_Package_Process_for_New_Contributors.adoc index 600fda6..3a849ff 100644 --- a/modules/ROOT/pages/New_Package_Process_for_New_Contributors.adoc +++ b/modules/ROOT/pages/New_Package_Process_for_New_Contributors.adoc @@ -166,16 +166,7 @@ you can report the problem to https://pagure.io/fedora-infra/toddlers/issues[Tod `fedpkg request-repo` only creates a branch for Rawhide. To request branches for other Fedora releases, -use `fedpkg request-branch`: - -[subs="attributes+"] -.... -fedpkg request-branch --repo python-prometheus_client f{MAJOROSVER} -.... - -You will need to run this for each non-rawhide branch. -If you wish, you can also use the `--all-releases` flag -to request branches for all current Fedora releases. +see xref:Package_Maintenance_Guide.adoc#requesting_branches[Requesting branches]. [#check_out_the_distgit_repository] == [[check_out_the_module]] Check out the distgit repository diff --git a/modules/ROOT/pages/Package_Maintenance_Guide.adoc b/modules/ROOT/pages/Package_Maintenance_Guide.adoc index d531d89..8a944ec 100644 --- a/modules/ROOT/pages/Package_Maintenance_Guide.adoc +++ b/modules/ROOT/pages/Package_Maintenance_Guide.adoc @@ -342,6 +342,15 @@ This command will request git branches for every currently active Fedora release [subs="attributes+"] .... +fedpkg request-branch --repo f40 +.... + +This form can be used to request branches when not inside package's Git repository. +You do not need to wait for your repository to be created before filing such branch request, +but you should request the repository before requesting branches. + +[subs="attributes+"] +.... fedpkg request-branch epel{MAJOREPELVER} .... diff --git a/modules/ROOT/pages/Package_Review_Process.adoc b/modules/ROOT/pages/Package_Review_Process.adoc index d5474dd..94452e2 100644 --- a/modules/ROOT/pages/Package_Review_Process.adoc +++ b/modules/ROOT/pages/Package_Review_Process.adoc @@ -125,16 +125,7 @@ Otherwise your repository request will be closed as invalid. * If you want to add your package to more Fedora releases and not just Rawhide, -let's say to Fedora {MAJOROSVER}, -you can use the following command to request additional branches: -+ -.... -fedpkg request-branch --repo my-package f{MAJOROSVER}` -.... -+ -You do not need to wait for your repository to be created -before filing your branch request, but -you should request the repository before requesting branches. +see xref:Package_Maintenance_Guide.adoc#requesting_branches[Requesting branches]. * When https://pagure.io/releng/fedora-scm-requests/issues[fedora-scm-requests tickets] for the requested repository and branches are closed,