[opensuse-buildservice] how to fix "broken: conflict in file"
How can a devel pkg have a conflict after a commit? How to fix it? multimedia:libs/gstreamer-0_10 $ obs r -v openSUSE_Tumbleweed x86_64 broken: conflict in file gstreamer-0_10.changes The pkg points to Factory, and the Factory pkg appearently links back to the devel prj. Olaf
On 07/25/2016 03:50 PM, Olaf Hering wrote:
How can a devel pkg have a conflict after a commit? How to fix it?
multimedia:libs/gstreamer-0_10 $ obs r -v openSUSE_Tumbleweed x86_64 broken: conflict in file gstreamer-0_10.changes
The pkg points to Factory, and the Factory pkg appearently links back to the devel prj.
Olaf
I've had this with enlightenment packages a few times its pretty annoying, someone with maintainer rights needs to checkout the package using osc then manually resolve the conflicts. -- Simon Lees (Simotek) http://simotek.net Emergency Update Team keybase.io/simotek SUSE Linux Adeliade Australia, UTC+9:30 GPG Fingerprint: 5B87 DB9D 88DC F606 E489 CEC5 0922 C246 02F0 014B
On Mon, Jul 25, 2016 at 03:54:00PM +0930, Simon Lees wrote:
On 07/25/2016 03:50 PM, Olaf Hering wrote:
How can a devel pkg have a conflict after a commit? How to fix it?
multimedia:libs/gstreamer-0_10 $ obs r -v openSUSE_Tumbleweed x86_64 broken: conflict in file gstreamer-0_10.changes
The pkg points to Factory, and the Factory pkg appearently links back to the devel prj.
Olaf
I've had this with enlightenment packages a few times its pretty annoying, someone with maintainer rights needs to checkout the package using osc then manually resolve the conflicts.
osc up osc pull $EDITOR $FILE resolve the conflict via editing the $FILE. osc resolved $FILE osc ci Ciao, Marfcus -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
On Mon, 2016-07-25 at 15:54 +0930, Simon Lees wrote:
On 07/25/2016 03:50 PM, Olaf Hering wrote:
How can a devel pkg have a conflict after a commit? How to fix it?
multimedia:libs/gstreamer-0_10 $ obs r -v openSUSE_Tumbleweed x86_64 broken: conflict in file gstreamer- 0_10.changes
The pkg points to Factory, and the Factory pkg appearently links back to the devel prj.
Olaf
I've had this with enlightenment packages a few times its pretty annoying, someone with maintainer rights needs to checkout the package using osc then manually resolve the conflicts.
done that - seems like somebody was working on an unexpanded checkout... but fixing this kind of issue is not really difficult: osc co multimedia:libs/gstreamer-0_10 cd multimedia:libs/gstreamer-0_10 osc pull fix all the files that are marked with "C" (conflict, was gstreamer- 0_10.changes in this case) osc resolved <LIST OF FIXED FILES> (gstreamer-0_10.changes) osc ci -m 'unbroke branch' Cheers, Dominique
Am 25. Juli 2016 09:18:42 MESZ, schrieb Dominique Leuenberger / DimStar
done that - seems like somebody was working on an unexpanded checkout... but fixing this kind of issue is not really difficult:
But how can that happen anyway, osc commit would spot the inconsistency. I did run osc up -u before. Olaf -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
Am 25. Juli 2016 09:18:42 MESZ, schrieb Dominique Leuenberger / DimStar
: done that - seems like somebody was working on an unexpanded checkout... but fixing this kind of issue is not really difficult:
But how can that happen anyway, osc commit would spot the inconsistency. I did run osc up -u before. When you work on 'osc -u', then you take control over the 'unmerged'
On Mon, 2016-07-25 at 09:37 +0200, Olaf Hering wrote: sources - it's up to you to ensure it can be merged; there is hardly ever a reason to work on unmerged sources though. IT's basically only useful to fix up broken linking to start with. Cheers, Dominique
Am 25. Juli 2016 09:44:34 MESZ, schrieb Dominique Leuenberger / DimStar
When you work on 'osc -u', then you take control over the 'unmerged' sources - it's up to you to ensure it can be merged; there is hardly ever a reason to work on unmerged sources though. IT's basically only useful to fix up broken linking to start with.
Is this new behavior? I have always done it that way. And what should be merged anyway? The pkg in the devel prj is the master. Olaf -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
On Mo, Jul 25 2016, Olaf Hering
The pkg in the devel prj is the master.
The master is always the package in Factory. Andreas. -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different." -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
On 07/25/2016 04:48 PM, Dominique Leuenberger / DimStar wrote:
On Mon, 2016-07-25 at 15:54 +0930, Simon Lees wrote:
On 07/25/2016 03:50 PM, Olaf Hering wrote:
How can a devel pkg have a conflict after a commit? How to fix it?
multimedia:libs/gstreamer-0_10 $ obs r -v openSUSE_Tumbleweed x86_64 broken: conflict in file gstreamer- 0_10.changes
The pkg points to Factory, and the Factory pkg appearently links back to the devel prj.
Olaf
I've had this with enlightenment packages a few times its pretty annoying, someone with maintainer rights needs to checkout the package using osc then manually resolve the conflicts.
done that - seems like somebody was working on an unexpanded checkout... but fixing this kind of issue is not really difficult:
osc co multimedia:libs/gstreamer-0_10 cd multimedia:libs/gstreamer-0_10 osc pull fix all the files that are marked with "C" (conflict, was gstreamer- 0_10.changes in this case) osc resolved <LIST OF FIXED FILES> (gstreamer-0_10.changes) osc ci -m 'unbroke branch'
Cheers, Dominique
I think when I saw it I did something like 1. Submit update to factory 2. Edit something from the web UI (Spec file or changes) 3. Factory request was accepted After this point things seemed to end up in conflict, its less of a issue for me now that I don't use the web interface generally. -- Simon Lees (Simotek) http://simotek.net Emergency Update Team keybase.io/simotek SUSE Linux Adeliade Australia, UTC+9:30 GPG Fingerprint: 5B87 DB9D 88DC F606 E489 CEC5 0922 C246 02F0 014B
On Mo, Jul 25 2016, Simon Lees
I think when I saw it I did something like
1. Submit update to factory 2. Edit something from the web UI (Spec file or changes) 3. Factory request was accepted
If you modify the sources of a package (no matter how) after the submit request and without creating a new submit request to Factory for the new revision you can easily get a conflict.
After this point things seemed to end up in conflict, its less of a issue for me now that I don't use the web interface generally.
It's not a matter of using the webui. Andreas. -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different." -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
Olaf Hering
the Factory pkg appearently links back to the devel prj.
Why do you think so? Factory packages never link to anything outside Factory. Andreas. -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different." -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
participants (5)
-
Andreas Schwab
-
Dominique Leuenberger / DimStar
-
Marcus Meissner
-
Olaf Hering
-
Simon Lees