Greetings gang,
I just built and updated the autoqa -testing repositories with
revision release autoqa-0.5.1-1.
Happy birthday to the new release :-)
I attempted to follow the process outlined at
https://fedoraproject.org/wiki/AutoQA_Release_Process. Unfortunately,
I mistakenly committed all changes to 'master' first, then
cherry-picked into release-0.5.
I don't see a problem here. We want all the hotfixes to be included in master, right?
And they are. And we want all the hotfixes to be included in release-0.5, right? And they
are. I don't think it matters in which order you commit (to master and then
cherry-pick, or the other way around).
In the "AutoQA Release Process" page this is covered by a simple sentence:
"and apply all hotfixes you have prepared"
Should I try to be more specific in there?
I'm trying to think of a way to make
sure the autoqa.spec in 'master' is always a superset of anything in
the previously released branches. Until we're autogenerating the
autoqa.spec, I'm not sure of a clean way to do this.
I don't probably follow you. autoqa.spec changes should be covered here:
https://fedoraproject.org/wiki/AutoQA_Release_Process#Cherry-pick_to_master
That says that we want to cherry-pick the autoqa.spec change back to master (or the other
way around, as mentioned above). We want to avoid situation where we have e.g.
"Version:0.5.1" inside release-0.5:autoqa.spec, but we have just
"Version:0.5.0" inside master:autoqa.spec. And that's covered by the
cherry-pick. What else is needed?