On Wed, Sep 12, 2018 at 10:54 AM Dominik 'Rathann' Mierzejewski <dominik@xxxxxxxxxxxxxx> wrote:
On Tuesday, 11 September 2018 at 21:43, Richard Shaw wrote:
[...]
> This would take care of most of the complains about people using "git merge
> master" across release branches (even though that's the workflow documented
> in the wiki). I know I CAN use git cherry-pick but I've never used it
> before and again, I'm not a program. Almost everything I've learned about
> git is through Fedora package maintenance and some small pull requests for
> minor build fixes with packages I maintain.
>
> The hard part for me is maintaining EL 6/7 branches. I know there are a lot
> of complaints about using %if conditionals in specs to have one spec file
> for all Fedora and EPEL releases and I agree when it gets to be too much it
> makes the spec very unreadable especially by others (proven packagers) that
> may have to step in and make changes. If stream branches could somehow make
> this easier that would be great.
I found the "merging upwards" workflow from gitworkflows(7) quite useful for
Fedora for leaf packages that can be updated across the board while
retaining some small differences between branches like changelogs.
I still feel like having a single spec that builds everywhere, with a few %if conditionals should be easier to maintain than a multiple different ones. But as I said in the previous reply, if there is a really big difference between let's say Fedora and EPEL, or EPEL 6 vs. EPEL 7, we might need to think about splitting these into separate branches, but still having it appear as a single stream from the user perspective.
Branches remain mergeable and you can easily remove any conditionals and
keep cruft limited to older branches.
Regards,
Dominik
--
Fedora https://getfedora.org | RPMFusion http://rpmfusion.org
There should be a science of discontent. People need hard times and
oppression to develop psychic muscles.
-- from "Collected Sayings of Muad'Dib" by the Princess Irulan
_______________________________________________
devel mailing list -- devel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/devel@xxxxxxxxxxxxxxxxxxxxxxx
Adam Šamalík
---------------------------
Red Hat
_______________________________________________ devel mailing list -- devel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/devel@xxxxxxxxxxxxxxxxxxxxxxx
