[prev in list] [next in list] [prev in thread] [next in thread] 

List:       fedora-devel-list
Subject:    Re: Is there a policy for branches being merged or not
From:       Julian Sikorski <belegdol () gmail ! com>
Date:       2024-04-30 7:57:17
Message-ID: e01657f3-4d71-4e74-af39-2d30d83b88cf () gmail ! com
[Download RAW message or body]

Am 28.04.24 um 23:44 schrieb Kevin Kofler via devel:
> Julian Sikorski wrote:
>> In this case defaulting to cherry-picking would be a safer bet. Branches
>> unintentionally separated can be merged, but branches unintentionally
>> merged cannot be unmerged.
> 
> This is only true if you are talking about merge-commit merges. Not if we
> are keeping the branches fast-forwarded (and using %{?fedora} conditionals
> in the rare event something really needs to differ between the releases). A
> linear history cannot be remade truly linear once it was diverged by a
> cherry-pick (or simply a separate bump from running rpmdev-bumpspec
> separately on each branch, as scripted rebuilds often do). The best we can
> do to restore fast-forwardability is to merge one way and then "merge back",
> which will fast-forward the other branch to the same merge commit. This
> still leaves an ugly knot in the history, but at least the branches can then
> be fast-forwarded again. But a clean linear history is no longer possible
> after someone did an unwanted cherry pick instead of a fast-forward merge.
> 
>          Kevin Kofler

Fair enough. Summing up, mass rebuilds are going to mess up whatever the 
maintainer chose to do if the rebuilder decides to use the other approach.

Best regards,
Julian
--
_______________________________________________
devel mailing list -- devel@lists.fedoraproject.org
To unsubscribe send an email to devel-leave@lists.fedoraproject.org
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue

[prev in list] [next in list] [prev in thread] [next in thread]