[yast-devel] RFC: Maintenance branch for 13.1
Hi, as factory is already splitted to 13.1 and we have bunch of quite aggresive changes on stack like rake build system, rubify code or core changes, I think we should do fixes for 13.1 in maintenance branch following common naming schema[1] - openSUSE-13_1 Any comments, counter-proposals or complains? Josef [1] https://en.opensuse.org/openSUSE:YaST_SVN_to_GIT#Conventions ( yes, location sucks and we plan to improve documentation ) -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org
Dne 23.9.2013 11:32, Josef Reidinger napsal(a):
Hi, as factory is already splitted to 13.1 and we have bunch of quite aggresive changes on stack like rake build system, rubify code or core changes, I think we should do fixes for 13.1 in maintenance branch following common naming schema[1] - openSUSE-13_1
Any comments, counter-proposals or complains?
I fully agree with 13.1 branch, right now it the right time IMHO. Just a question: Should be the branches added globally to all yast Git repositories (by a script) or should each maintainer branch it manually? I'd rather do it for all repos globally to not miss something and because some repos do not have a responsible maintainer. Opinions? Ladislav -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org
On Mon, 23 Sep 2013 12:37:49 +0200 Ladislav Slezak <lslezak@suse.cz> wrote:
Dne 23.9.2013 11:32, Josef Reidinger napsal(a):
Hi, as factory is already splitted to 13.1 and we have bunch of quite aggresive changes on stack like rake build system, rubify code or core changes, I think we should do fixes for 13.1 in maintenance branch following common naming schema[1] - openSUSE-13_1
Any comments, counter-proposals or complains?
I fully agree with 13.1 branch, right now it the right time IMHO.
Just a question: Should be the branches added globally to all yast Git repositories (by a script) or should each maintainer branch it manually?
I'd rather do it for all repos globally to not miss something and because some repos do not have a responsible maintainer.
Opinions?
Ladislav
Well, I propose different approach to do it only when needed, as there is a lot of modules which doesn't have maintainer and that is not touched at all, so it doesn't need maintenance branch. Maybe it will nicely show usage of modules. Josef -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org
Dne 23.9.2013 15:34, Josef Reidinger napsal(a): [...]
Well, I propose different approach to do it only when needed, as there is a lot of modules which doesn't have maintainer and that is not touched at all, so it doesn't need maintenance branch. Maybe it will nicely show usage of modules.
It might sound good, but the problem is if you touch such an "unmaintained" module after like 6 months you will very likely (I'd say almost for sure, see later) forget to create the maintenance branch. And then after another 6 months it is pretty hard to find the correct commit backwards for creating a maintenance branch for a bugfix. Yes, you can checkout the OBS sources and find the last commit, but it's not trivial (checking just the *.changes file may not be enough as there might be just a small fix not mentioned in *.changes...). Therefore I suggest creating the branch for all relevant (included in openSUSE) repositories globally. And here starts the interesting part, I just have checked which repositories do NOT have 12.2 and 12.3 branches and surprisingly the number is quite high (see the attached files for complete list): - 84 repositories do not have 12.2 branch - 74 repositories do not have 12.3 branch (I have manually filtered out some obsoleted packages or product specific (SLE) packages, but I could overlook something in the quick search so these are probably not perfectly exact numbers, but they still demonstrate the problem quite nicely.) What's worse, even a base package like yast2-core does NOT have the maintenance branches so it's quite difficult to find the difference between releases or since the last release (e.g. "git log origin/openSUSE-12_2..origin/openSUSE-12_3" does not work). And that's really stupid. We could avoid this by adding the branches globally. -- Ladislav Slezák Appliance department / YaST Developer Lihovarská 1060/12 190 00 Prague 9 / Czech Republic tel: +420 284 028 960 lslezak@suse.com SUSE
On Tue, 24 Sep 2013 16:07:10 +0200 Ladislav Slezak <lslezak@suse.cz> wrote:
Dne 23.9.2013 15:34, Josef Reidinger napsal(a): [...]
Well, I propose different approach to do it only when needed, as there is a lot of modules which doesn't have maintainer and that is not touched at all, so it doesn't need maintenance branch. Maybe it will nicely show usage of modules.
It might sound good, but the problem is if you touch such an "unmaintained" module after like 6 months you will very likely (I'd say almost for sure, see later) forget to create the maintenance branch.
And then after another 6 months it is pretty hard to find the correct commit backwards for creating a maintenance branch for a bugfix.
Yes, you can checkout the OBS sources and find the last commit, but it's not trivial (checking just the *.changes file may not be enough as there might be just a small fix not mentioned in *.changes...).
Therefore I suggest creating the branch for all relevant (included in openSUSE) repositories globally.
And here starts the interesting part, I just have checked which repositories do NOT have 12.2 and 12.3 branches and surprisingly the number is quite high (see the attached files for complete list):
- 84 repositories do not have 12.2 branch - 74 repositories do not have 12.3 branch
(I have manually filtered out some obsoleted packages or product specific (SLE) packages, but I could overlook something in the quick search so these are probably not perfectly exact numbers, but they still demonstrate the problem quite nicely.)
What's worse, even a base package like yast2-core does NOT have the maintenance branches so it's quite difficult to find the difference between releases or since the last release (e.g. "git log origin/openSUSE-12_2..origin/openSUSE-12_3" does not work).
And that's really stupid. We could avoid this by adding the branches globally.
OK, sounds reasonable. I plan to create script, that allows such global operation do easy. Maybe integrate it with meta package and maybe merge meta and devtools? Josef
--
Ladislav Slezák Appliance department / YaST Developer Lihovarská 1060/12 190 00 Prague 9 / Czech Republic tel: +420 284 028 960 lslezak@suse.com SUSE
-- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org
On 23.9.2013 12:37, Ladislav Slezak wrote:
Just a question: Should be the branches added globally to all yast Git repositories (by a script) or should each maintainer branch it manually?
I'd rather do it for all repos globally to not miss something and because some repos do not have a responsible maintainer.
Opinions?
Some git repos might already contain the branches. If you create them by a script, you would also have to make sure the branch is created exactly at the last commit that is in openSUSE 13.1 and I'm afraid some commits actually did not make it to openSUSE 13.1. Bye Lukas -- Lukas Ocilka, Cloud & Systems Management Department SUSE LINUX s.r.o., Praha -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org
On Mon, 23 Sep 2013 11:32:36 +0200 Josef Reidinger <jreidinger@suse.cz> wrote:
Hi, as factory is already splitted to 13.1 and we have bunch of quite aggresive changes on stack like rake build system, rubify code or core changes, I think we should do fixes for 13.1 in maintenance branch following common naming schema[1] - openSUSE-13_1
Any comments, counter-proposals or complains? Josef
[1] https://en.opensuse.org/openSUSE:YaST_SVN_to_GIT#Conventions ( yes, location sucks and we plan to improve documentation )
Update from coolo. When we need to do update for 13.1 we can now use submit request againsts openSUSE:13.1:Update project and it will be included to 13.1 release. I think we really need to make such branch ASAP, as we need CI, and for it we need to merge spec using rpm macros, add rakefiles to easy run it ( infrastructure is already ready ) and we want to add new rspec tests, that can be run in next version of opensuse. Josef -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org
Dne 25.9.2013 10:31, Josef Reidinger napsal(a): [...]
I think we really need to make such branch ASAP, as we need CI, and for it we need to merge spec using rpm macros, add rakefiles to easy run it ( infrastructure is already ready ) and we want to add new rspec tests, that can be run in next version of opensuse.
OK, so the proposal is to create the 13.1 branch in all relevant repositories tomorrow at noon - 26.9. 12:00AM CEST (=GMT+2). Then the 13.1 bug fixes should go to the openSUSE-13_1 branch, you will need to package the sources manually and submit them to the OBS via 13.1 maintenance project (openSUSE:13.1:Update). Do not forget to merge/cherry-pick the fixes also to master for the next release. (You can do it after each commit gradually, or at once after 13.1 is released, I'd leave it on respective maintainers.) The 13.2/SLE12 development will start in master, with package versions 3.1.x (I originally thought it could be possible to stay with 13.1 in master for some packages which need lot changes to 13.1, but the new CI integration requires adapting all packages so we cannot allow exceptions, sorry.) Please, speak up ASAP if you have any objection or comment to the proposal. -- Ladislav Slezák Appliance department / YaST Developer Lihovarská 1060/12 190 00 Prague 9 / Czech Republic tel: +420 284 028 960 lslezak@suse.com SUSE -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org
On Wed, Sep 25, 2013 at 01:59:35PM +0200, Ladislav Slezak wrote:
OK, so the proposal is to create the 13.1 branch in all relevant repositories tomorrow at noon - 26.9. 12:00AM CEST (=GMT+2).
Then the 13.1 bug fixes should go to the openSUSE-13_1 branch, you will need to package the sources manually and submit them to the OBS via 13.1 maintenance project (openSUSE:13.1:Update). Do not forget to merge/cherry-pick the fixes also to master for the next release. (You can do it after each commit gradually, or at once after 13.1 is released, I'd leave it on respective maintainers.)
The 13.2/SLE12 development will start in master, with package versions 3.1.x
Please, speak up ASAP if you have any objection or comment to the proposal.
Just for the record, I, a past perpetrator of global branching, agree with all proposals in this thread. -- Martin Vidner, Cloud & Systems Management Team http://en.opensuse.org/User:Mvidner Kuracke oddeleni v restauraci je jako fekalni oddeleni v bazenu
participants (4)
-
Josef Reidinger -
Ladislav Slezak -
Lukas Ocilka -
Martin Vidner