[yast-devel] openSUSE-13_1 branches created
Hi all, I have created openSUSE-13_1 branches for all relevant Yast packages which are included in openSUSE-13.1 (see the attachment) and also for libyui packages. Use this branch for 13.1 fixes and maintenance updates, the master is now open for Factory/13.2/SLE12 development. That also means do not submit packages from YaST:Head to 13.1. Steps for submitting 13.1 fixes: git checkout openSUSE-13_1 < make a fix, create a pull request to 13.1 branch (not to master!), review PRs, merge... as ususally> make -f Makefile.cvs make package-local osc bco openSUSE:13.1:Update <package> < copy the package sources > < try the build locally > osc build < commit the changes and create a submit request > osc commit osc sr < after you are done with the fix merge it also to master> git checkout master < resolve possible conflicts, likely in VERSION and *.changes > git merge openSUSE-13_1 git push -- Best Regards Ladislav Slezák Yast Developer ------------------------------------------------------------------------ SUSE LINUX, s.r.o. e-mail: lslezak@suse.cz Lihovarská 1060/12 tel: +420 284 028 960 190 00 Prague 9 fax: +420 284 028 951 Czech Republic http://www.suse.cz/
Dne 26.9.2013 13:17, Ladislav Slezak napsal(a):
Steps for submitting 13.1 fixes:
[...]
I'd say these steps should be recorded at some more permanent place, like a wiki.
< resolve possible conflicts, likely in VERSION and *.changes > git merge openSUSE-13_1
Was any agreement *how* these should be resolved reached? (I remember a discussion about this in the Prague SUSE office, but IIRC without clear conclusion.) -- David Majda SUSE developer -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org
Hi, On Thu, Sep 26, Ladislav Slezak wrote:
I have created openSUSE-13_1 branches for all relevant Yast packages which are included in openSUSE-13.1 (see the attachment) and also for libyui packages.
JFI: I just created the same branch in git repository for libstorage Tschuess, Thomas Fehr -- Thomas Fehr, SuSE Linux Products GmbH, Maxfeldstr. 5, 90409 Nuernberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) Tel: +49-911-74053-0, Fax: +49-911-74053-482, Email: fehr@suse.de GPG public key available. -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org To contact the owner, e-mail: yast-devel+owner@opensuse.org
Dne 26.9.2013 13:17, Ladislav Slezak napsal(a): [...]
Use this branch for 13.1 fixes and maintenance updates, the master is now open for Factory/13.2/SLE12 development. That also means do not submit packages from YaST:Head to 13.1.
And if you submit a package from YaST:Head to Factory put a big "NOT FOR 13.1" to the message, just to be sure it won't go to 13.1 by mistake. -- 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
participants (3)
-
David Majda
-
Ladislav Slezak
-
Thomas Fehr