[opensuse-buildservice] how to resolve conflict in linked package's spec?
Hi *, OBS displays a conflict in the spec file of the package to which my current package is linked to. How can I resolve this situation? Details: I'm preparing the upgrade of the "coreutils" package for Base:System. Therefore, I've - at first - created a project home:bernhard-voelker:bleeding_edge and created a branch for the package coreutils linked to Base:System/coreutils. After some time of work - the upgrade went quite well - I noticed that I need to backport su(1) because it's been removed from the new upstream version. To not interfere with the first branch, I created another project home:bernhard-voelker:bleeding_edge+su and created a branch for coreutils based on home:bernhard-voelker:bleeding_edge/coreutils. The new commit in bleeding_edge+su/coreutils and the build went well, but after some time, OBS now presents me the following message: "Files could not be expanded: home:bernhard-voelker:bleeding_edge/coreutils: conflict in file coreutils.spec" ... and all builds show up as broken now. I didn't change anything in bleeding_edge/coreutils since branching off bleeding_edge+su/coreutils. That's confusing. ;-( What can I do now? What I want to do in a few days is to bring the stuff from bleeding_edge+su/coreutils into Base:System/coreutils. Thank you & have a nice day, Berny -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
On Don, 2013-04-04 at 23:19 +0200, Bernhard Voelker wrote:
Hi *,
OBS displays a conflict in the spec file of the package to which my current package is linked to. How can I resolve this situation?
Details: I'm preparing the upgrade of the "coreutils" package for Base:System. Therefore, I've - at first - created a project home:bernhard-voelker:bleeding_edge and created a branch for the package coreutils linked to Base:System/coreutils.
After some time of work - the upgrade went quite well - I noticed that I need to backport su(1) because it's been removed from the new upstream version. To not interfere with the first branch, I created another project home:bernhard-voelker:bleeding_edge+su and created a branch for coreutils based on home:bernhard-voelker:bleeding_edge/coreutils.
The new commit in bleeding_edge+su/coreutils and the build went well, but after some time, OBS now presents me the following message:
"Files could not be expanded: home:bernhard-voelker:bleeding_edge/coreutils: conflict in file coreutils.spec"
... and all builds show up as broken now. I didn't change anything in bleeding_edge/coreutils since branching off bleeding_edge+su/coreutils. That's confusing. ;-( What can I do now?
What I want to do in a few days is to bring the stuff from bleeding_edge+su/coreutils into Base:System/coreutils.
Thank you & have a nice day,
Berny, The issue is that the .spec file in any of the 'parent' projects was changed.. and branches inherit these changes and those happen to conflict now... No real damage though if you use osc. osc co home:bernhard-voelker:bleeding_edge/coreutils => this will work, with a small error about the .spec conflict... cd home:bernhard-voelker:bleeding_edge/coreutils osc pull => a 3-way merge is attempted.. and you get a .spec file with <<< , === and >>> tags for the conflicts... simply rebase what is needed, then: osc resolved <file that had conflict> osc ci -m "Rebased" and you're all done. Hth, Dominique -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
On 04/04/2013 11:25 PM, Dimstar / Dominique Leuenberger wrote:
The issue is that the .spec file in any of the 'parent' projects was changed.. and branches inherit these changes and those happen to conflict now...
ah, mmeister changed something I wasn't aware of. Well, the error message is quite irritating ... at least in the web UI of OBS you don't have the chance to see what's wrong in the spec file. Thanks! Have a nice day, Berny -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
On 04/04/2013 11:34 PM, Bernhard Voelker wrote:
On 04/04/2013 11:25 PM, Dimstar / Dominique Leuenberger wrote:
The issue is that the .spec file in any of the 'parent' projects was changed.. and branches inherit these changes and those happen to conflict now...
ah, mmeister changed something I wasn't aware of. Well, the error message is quite irritating ... at least in the web UI of OBS you don't have the chance to see what's wrong in the spec file.
Thanks!
Hmm, the merging via 'osc pull' only worked for propagating the changes from Base:System/coreutils to home:bernhard-voelker:bleeding_edge/coreutils, but it then fails for pulling in the changes to bleeding_edge+su/coreutils: $ osc pull Server returned an error: HTTP Error 400: home bernhard-voelker bleeding_edge/coreutils conflict in file coreutils.spec home:bernhard-voelker:bleeding_edge/coreutils: conflict in file coreutils.spec Any ideas? Okay, I could start over with a new project based on Base:System and use then use the working tree from my old checkout, but that can't be the proper solution. Have a nice day, Berny -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
participants (2)
-
Bernhard Voelker -
Dimstar / Dominique Leuenberger