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. Does this answer your question? Greetings, Stephan -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-packaging+help@opensuse.org