From 33c670141ec7ed616dcd5891a92cedd723a10d80 Mon Sep 17 00:00:00 2001 From: Maja Massarini Date: Mon, 28 Oct 2024 11:12:13 +0100 Subject: [PATCH] Add blog post for non-divergent dist-git branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Laura Barcziová <49026743+lbarcziova@users.noreply.github.com> --- .../dist-git-onboarding.md | 2 +- .../non-divergent-dist-git-branches.md | 4 +-- .../non-divergent-dist-git-branches/index.md | 29 +++++++++++++++++++ 3 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 posts/non-divergent-dist-git-branches/index.md diff --git a/docs/fedora-releases-guide/dist-git-onboarding.md b/docs/fedora-releases-guide/dist-git-onboarding.md index 0599f07e3..29d1a38a1 100644 --- a/docs/fedora-releases-guide/dist-git-onboarding.md +++ b/docs/fedora-releases-guide/dist-git-onboarding.md @@ -88,7 +88,7 @@ and not from `upstream_project_url`. You can check the other customization options [here](./index.md#customization). :::info Divergent dist-git branches -By default, release syncing can result in divergent dist-git branches. To prevent this, refer to the details [here](/docs/fedora-releases-guide/non-divergent-dist-git-branches.md). +By default, release syncing can result in divergent dist-git branches. To prevent this, refer to the configuration details [here](/docs/fedora-releases-guide/non-divergent-dist-git-branches.md). ::: diff --git a/docs/fedora-releases-guide/non-divergent-dist-git-branches.md b/docs/fedora-releases-guide/non-divergent-dist-git-branches.md index 16a1ae8ad..72cdd7b3c 100644 --- a/docs/fedora-releases-guide/non-divergent-dist-git-branches.md +++ b/docs/fedora-releases-guide/non-divergent-dist-git-branches.md @@ -1,9 +1,9 @@ --- -title: non-divergent dist-git branches +title: Non-divergent dist-git branches sidebar_position: 7 --- -# non-divergent dist-git branches +# Non-divergent dist-git branches To prevent your dist-git branches from diverging, you can use the following `dist_git_branches` syntax: diff --git a/posts/non-divergent-dist-git-branches/index.md b/posts/non-divergent-dist-git-branches/index.md new file mode 100644 index 000000000..1491f9098 --- /dev/null +++ b/posts/non-divergent-dist-git-branches/index.md @@ -0,0 +1,29 @@ +--- +title: "No More Divergent Branches with Packit!" +date: 2024-10-28T10:46:18+02:00 +authors: mmassari +tags: + - propose-downstream + - pull-from-upstream + - downstream + - configuration +--- + +Were you annoyed by Packit creating divergent branches in your package's dist-git repository? You'll be happy to know that Packit now supports a new `dist_git_branches` syntax that enables fast-forwarding commits between branches. + + + +## What's New + +When defining a `propose-downstream` or `pull-from-upstream` job, you can use the new `dist_git_branches` syntax. + +``` + dist_git_branches: + rawhide: + fast_forward_merge_into: [fedora-branched] + epel-9: {} +``` + +In this example, Packit runs the downstream synchronization process for the `rawhide` and `epel-9` branches as usual. Additionally, Packit opens a new pull request, reusing the commit from `rawhide`, for every `fedora-branched` branch, allowing it to be fast-forwarded when merging. + +Do you want to know more? Look at the [non-divergent dist-git branches guide](/docs/fedora-releases-guide/non-divergent-dist-git-branches)