On Fri, 2020-02-28 at 15:45 +0100, clime wrote:
> I thought the main reason not to combine update in the changelog file
> with
> code commits is to avoid conflicts when cherry picking as you
> described.
>
> I.e. i do minor update specifically in f32 and generate changelog
> file
> in the same commit.
> Then I want to do normal release update for all fedora branches. I
> start with master (as usual)
> and add e.g. add a new patch and generate the changelog file because
> i
> would like to add more info, then commit.
> Now I cannot cherry-pick that commit into f32 without conflict.
>
> In this case we wouldn't achieve one the targets of this proposal
> (afaik) => getting rid of merge conflicts in changelog and release -
> this is cherry-picking but still it would be nice not to have
> conflicts there.
> This target isn't in the document i think but i thought this is one
> of
> the goals.
Leaving aside the advantages or disadvantages of a detached changelog
(vs. in-spec vs. "everything from the commits"), our aim is to reduce
the potential for conflicts between concurrent PRs or when cherry-
picking between branches. If what we end up with can't avoid them
completely for (what should be) corner cases, like when you have to
manually fuzz with the generated changelog, that may not be ideal, but
it's still a considerable improvement over the present situation.
Nils
--
Nils Philippsen "Those who would give up Essential Liberty to
Software Engineer purchase a little Temporary Safety, deserve neither
Red Hat Liberty nor Safety." -- Benjamin Franklin, 1759
PGP fingerprint: D0C1 1576 CDA6 5B6E BBAE 95B2 7D53 7FCA E9F6 395D
old: C4A8 9474 5C4C ADE3 2B8F 656D 47D8 9B65 6951 3011
_______________________________________________
devel mailing list -- devel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxxxxxxxx
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@xxxxxxxxxxxxxxxxxxxxxxx
