On 03. 10. 19 11:58, Kevin Kofler wrote:
I don't understand the people actually maintaining different changelogs for
the releases. I just merge master into the release branches when I push an
update, and if that includes some changelog entries for Rawhide-only mass
rebuilds, so be it. Removing them is not worth breaking fast-forwardability
of the branches.
It goes like this:
- master and f31 are at the same commit "aaaaaa"
- I push a change only possible in rawhide, commit "bbbbbb" to master
(it includes release bump and changelog entry)
- a commit relevant for both, "cccccc" is pushed to master
(it includes release bump and changelog entry)
- on f31, I run `git cherry-pick cccccc` => conflict
I don't worry about having "Fedora 31 mass rebuild" or "Rebuilt for python 3.8"
changelong entries in Fedora 29 (it gives me a little flinch, but nothing
serious). i worry about the bbbbbb commit I cannot merge into f31 (e.g. if it
implements some Fedora 32 change).
Then obviously, people start inventing %if spaghetti.
--
Miro Hrončok
--
Phone: +420777974800
IRC: mhroncok
_______________________________________________
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
