On Sun, Apr 28, 2024 at 10:27:26AM +0200, Julian Sikorski wrote: > Hello, > > is there a general recommendation regarding keeping git release > branches separate vs merged? I have been keeping mine separate. > Originally to avoid release and changelog conflicts when > cherry-picking, but I got used to it and kept doing it after > converting to %autorelase and %autochangelog. I actually don't think this really matters much, but I try to keep branches merged, until they require cherry picking for a specific reason. As a concrete example: https://src.fedoraproject.org/rpms/nbdkit/commits/rawhide https://src.fedoraproject.org/rpms/nbdkit/commits/f40 These two branches were merged until a couple of months ago when rawhide required the bash-completion-devel package (which is not in F40), and then I switched to cherry picking. Later still we switched F40 to a different upstream branch so now they're completely separate. > Recently one of my packages got it branches merged by a > provenpackager doing a deps rebuild. If there is no policy to merge, > this is disappointing as force-pushes as not allowed and branches > once merged cannot be unmerged. If this last bit true? > I know this is just a cosmetic issue, but choices made by the > primary maintainers should be respected IMO. I agree in general, but sometimes if you're making mechanical changes across 100s of packages it's hard to do this in practice. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com libguestfs lets you edit virtual machines. Supports shell scripting, bindings from many languages. http://libguestfs.org -- _______________________________________________ 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 Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
