[opensuse-buildservice] conflict in spec
Hi, I am maintaining shorewall in security:netfilter and the package was yesterdat accepted into factory. Now I have a problem, the package itself at security:netfilter has a broken spec hence it is broken and can't build. Mind you that I haven't done anything. Moreover, when I want to branch this package so I can update with a new version I just get an empty package in home:branches:security:netfilter/shorewall. Am I missing something obvious, or can someone explain me how can a valid spec and a building package without doing nothing becomes broken Thanks Togan -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
On Fri, Aug 12, 2011 at 09:43:42AM +0200, Togan Muftuoglu wrote:
Hi,
I am maintaining shorewall in security:netfilter and the package was yesterdat accepted into factory. Now I have a problem, the package itself at security:netfilter has a broken spec hence it is broken and can't build. Mind you that I haven't done anything.
Moreover, when I want to branch this package so I can update with a new version I just get an empty package in home:branches:security:netfilter/shorewall.
Am I missing something obvious, or can someone explain me how can a valid spec and a building package without doing nothing becomes broken
Thanks
in security:netfilter/shorewall, run osc up and/or osc pull Ciao, MArcus -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
On 08/12/2011 09:45 AM, Marcus Meissner wrote:
On Fri, Aug 12, 2011 at 09:43:42AM +0200, Togan Muftuoglu wrote:
Hi,
I am maintaining shorewall in security:netfilter and the package was yesterdat accepted into factory. Now I have a problem, the package itself at security:netfilter has a broken spec hence it is broken and can't build. Mind you that I haven't done anything.
Moreover, when I want to branch this package so I can update with a new version I just get an empty package in home:branches:security:netfilter/shorewall.
Am I missing something obvious, or can someone explain me how can a valid spec and a building package without doing nothing becomes broken
Thanks
in security:netfilter/shorewall, run osc up and/or osc pull
that was it and before doing I did a osc log security:netfilter shorewall """ r27 | saschpe | 2011-08-11 15:58:12 | 9f6c595f0fc6d49f197b8b63ce4ddcba | unknown | rq74031 initialized devel package after accepting 74031 """" so that is the cause as I understand. as the version in factory is 4.4.20.3 while devel project was 4.4.22 and I did not want it to broke further. But shouldn't making the above initialization respect the fact that version number in the devel package was higher and rather than causing a broken. What can I do for this not happening, or does this all the time happen, when I submit an updated version of the package to factory Thanks Togan -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
On Fri, Aug 12, 2011 at 09:59:45AM +0200, Togan Muftuoglu wrote:
On 08/12/2011 09:45 AM, Marcus Meissner wrote:
On Fri, Aug 12, 2011 at 09:43:42AM +0200, Togan Muftuoglu wrote:
Hi,
I am maintaining shorewall in security:netfilter and the package was yesterdat accepted into factory. Now I have a problem, the package itself at security:netfilter has a broken spec hence it is broken and can't build. Mind you that I haven't done anything.
Moreover, when I want to branch this package so I can update with a new version I just get an empty package in home:branches:security:netfilter/shorewall.
Am I missing something obvious, or can someone explain me how can a valid spec and a building package without doing nothing becomes broken
Thanks
in security:netfilter/shorewall, run osc up and/or osc pull
that was it and before doing I did a
osc log security:netfilter shorewall
""" r27 | saschpe | 2011-08-11 15:58:12 | 9f6c595f0fc6d49f197b8b63ce4ddcba | unknown | rq74031
initialized devel package after accepting 74031 """"
so that is the cause as I understand. as the version in factory is 4.4.20.3 while devel project was 4.4.22 and I did not want it to broke further. But shouldn't making the above initialization respect the fact that version number in the devel package was higher and rather than causing a broken.
What can I do for this not happening, or does this all the time happen, when I submit an updated version of the package to factory
The package is linked to factory, so it need merging if it changes in factory. Usually changes are automerged. When doing a osc pull it should have a in current working directory files with conflicts that you then can resolve. (edit the file with conflicts, then "osc resolved filename" then "osc ci" when all are done) Ciao, Marcus -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
On 08/12/2011 10:33 AM, Marcus Meissner wrote:
The package is linked to factory, so it need merging if it changes in factory. Usually changes are automerged.
That I thought
When doing a osc pull it should have a in current working directory files with conflicts that you then can resolve.
(edit the file with conflicts, then "osc resolved filename" then "osc ci" when all are done)
Thanks I knew this part but at least it confirmed what I was doing is right :) Thanks Togan -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
To me it looks like you submitted a version to factory, continued updating it - and then the version got approved to factory for the first time and as such Sascha setup your project as devel project - and that way you have the problem. This is something that does not happen in general, just in this case of first submission. Let's ask the experts what we can really do to avoid this, Andreas -- Andreas Jaeger, Program Manager openSUSE aj@{suse.com,opensuse.org} Twitter/Identica: jaegerandi SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 16746 (AG Nürnberg) GPG fingerprint = 93A3 365E CE47 B889 DF7F FED1 389A 563C C272 A126 -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
Am Freitag, 12. August 2011, 11:45:43 schrieb Andreas Jaeger:
To me it looks like you submitted a version to factory, continued updating it - and then the version got approved to factory for the first time and as such Sascha setup your project as devel project - and that way you have the problem.
This is something that does not happen in general, just in this case of first submission.
Let's ask the experts what we can really do to avoid this,
The conflict gets most likely created due to house internal modifications during factory check-in process. We are about to drop this and do check-ins directly in OBS, which should avoid most (but not all) cases of merge conflicts. bye adrian -- Adrian Schroeter SUSE Linux Products GmbH email: adrian@suse.de -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
On 08/12/2011 11:45 AM, Andreas Jaeger wrote:
To me it looks like you submitted a version to factory, continued updating it - and then the version got approved to factory for the first time and as such Sascha setup your project as devel project - and that way you have the problem.
Exactly the case. during the waiting process I asked the factory mailing list if I should superseed my request for the new version or wait and the advice was to wait. However as the package had bugfixes and version upgrades I had to continue to work with it in the devel project.
This is something that does not happen in general, just in this case of first submission.
good to hear :)
Let's ask the experts what we can really do to avoid this,
Thanks Togan -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-buildservice+help@opensuse.org
participants (4)
-
Adrian Schröter
-
Andreas Jaeger
-
Marcus Meissner
-
Togan Muftuoglu