Le mardi 19 janvier 2010, à 12:59 +0100, Stephan Kulow a écrit :
Am Dienstag 19 Januar 2010 schrieb Vincent Untz:
Can someone confirm that if I submit something from a branch to oS:F and it gets accepted, even if some oS:F checkin scripts changes a bit the .spec file, the branch will be updated to be the exact same content as oS:F?
For example, it'd be quite bad that the checkin scripts changing the License tags (from "GPL v2 or later" to "GPLv2+") create a difference between oS:F and the branch.
The checkin will not change the .spec file that is in the devel project.
But normally you would work on the expanded sources (osc up -e) and those are always a "merge" between what changed in O:F and what changed in the devel project. As the license change happend in O:F only, the "merge" will make it appear to happened in the devel project too - and that's also what the devel projects will build.
If you change the license tag too, you create a merge conflict (and this is about the only way to make a branch "broken"). To avoid this, you can use osc pull to pull the O:F changes explicitly into your project.
So it leads me to a few other questions/comments: + is there an easy way to know that there's something to pull? + the license example is something that should be auto-pulled, IMHO. I don't want to learn about the change in the parent package only when I change from GPLv2 to GPLv3... (or we should start killing the checkin scripts). [I understand it's probably not easily doable, but that's something we'll have to consider at some point] + would it make sense to have an autopull setting? That would mean "every time something changes in the parent package, pull if this doesn't break the branch package". Or is there already such a setting? I would guess that what most people would want to have is branch packages with autopull, and a big warning in the status page when a pull would break the package (which means someone has to manually fix the package). At least, that's what I would like to have, I think. Vincent -- Les gens heureux ne sont pas pressés. -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org