[opensuse-packaging] Fixing a link to source package
Hi, I had branched a couple of python package into a different project, which now all run into an error: Link has errors: conflict in file foo.spec. Obviously the source file has changed, and as I did not touch the spec file, my expectation would be that the linked package takes over these changes, or that there is at least an easy way to sync them again. I've checked osc man page but could not find the right command. Any hints? Thanks Axel -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-packaging+owner@opensuse.org
On 12 Jun 11:52, Axel Braun wrote:
Hi, I had branched a couple of python package into a different project, which now all run into an error:
Link has errors: conflict in file foo.spec.
Obviously the source file has changed, and as I did not touch the spec file, my expectation would be that the linked package takes over these changes, or that there is at least an easy way to sync them again.
I've checked osc man page but could not find the right command.
Any hints?
Do an osc pull, fix the conflicts and do osc resolved foo.spec Regards, ismail -- SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
Am Dienstag, 12. Juni 2018, 11:56:36 CEST schrieb İsmail Dönmez:
On 12 Jun 11:52, Axel Braun wrote:
Hi, I had branched a couple of python package into a different project, which now all run into an error:
Link has errors: conflict in file foo.spec.
Obviously the source file has changed, and as I did not touch the spec file, my expectation would be that the linked package takes over these changes, or that there is at least an easy way to sync them again.
I've checked osc man page but could not find the right command.
Any hints?
Do an osc pull, fix the conflicts and do osc resolved foo.spec
That helped, thanks! As this is now some effort to fix all files, what is the recommended procedure if you are not intended to change anything within a branch? osc linkpac? Thanks Axel -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-packaging+owner@opensuse.org
On Jun 12 2018, Axel Braun <axel.braun@gmx.de> wrote:
As this is now some effort to fix all files, what is the recommended procedure if you are not intended to change anything within a branch? osc linkpac?
A conflict can only occur if you have modified the source wrt. the parent (use osc pdiff to show). 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-packaging+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-packaging+owner@opensuse.org
On 12 Jun 12:12, Axel Braun wrote:
Am Dienstag, 12. Juni 2018, 11:56:36 CEST schrieb İsmail Dönmez:
On 12 Jun 11:52, Axel Braun wrote:
Hi, I had branched a couple of python package into a different project, which now all run into an error:
Link has errors: conflict in file foo.spec.
Obviously the source file has changed, and as I did not touch the spec file, my expectation would be that the linked package takes over these changes, or that there is at least an easy way to sync them again.
I've checked osc man page but could not find the right command.
Any hints?
Do an osc pull, fix the conflicts and do osc resolved foo.spec
That helped, thanks! As this is now some effort to fix all files, what is the recommended procedure if you are not intended to change anything within a branch? osc linkpac?
If you never intend to change use linkpac, if you only need the binary to be present (eg. you don't need to recompile it for some reason), use _aggregate: https://en.opensuse.org/openSUSE:Build_Service_Tips_and_Tricks#link_and_aggr... Regards, ismail -- SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
On 12.06.2018 11:56, İsmail Dönmez wrote:
On 12 Jun 11:52, Axel Braun wrote:
Hi, I had branched a couple of python package into a different project, which now all run into an error:
Link has errors: conflict in file foo.spec.
Obviously the source file has changed, and as I did not touch the spec file, my expectation would be that the linked package takes over these changes, or that there is at least an easy way to sync them again.
I've checked osc man page but could not find the right command.
Any hints?
Do an osc pull, fix the conflicts and do osc resolved foo.spec
Is there any way to issue such osc commands when working with the web interface? I have branched several packages, and currently delete then branch again when a conflict in spec file occurs. -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-packaging+owner@opensuse.org
On 28/06/18 11:03, Christoph Feck wrote:
On 12.06.2018 11:56, İsmail Dönmez wrote:
On 12 Jun 11:52, Axel Braun wrote:
Hi, I had branched a couple of python package into a different project, which now all run into an error:
Link has errors: conflict in file foo.spec.
Obviously the source file has changed, and as I did not touch the spec file, my expectation would be that the linked package takes over these changes, or that there is at least an easy way to sync them again.
I've checked osc man page but could not find the right command.
Any hints?
Do an osc pull, fix the conflicts and do osc resolved foo.spec
Is there any way to issue such osc commands when working with the web interface? I have branched several packages, and currently delete then branch again when a conflict in spec file occurs.
No currently you need to checkout the repository locally with the commandline tools, use osc pull, manually merge any changes, mark them as resolved with osc then commit them. This workflow isn't currently possible from the web interface, I agree in some cases it would be pretty useful though. -- Simon Lees (Simotek) http://simotek.net Emergency Update Team keybase.io/simotek SUSE Linux Adelaide Australia, UTC+10:30 GPG Fingerprint: 5B87 DB9D 88DC F606 E489 CEC5 0922 C246 02F0 014B
On Jun 12 2018, Axel Braun <axel.braun@gmx.de> wrote:
I had branched a couple of python package into a different project, which now all run into an error:
Link has errors: conflict in file foo.spec.
Run osc pull to merge. 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-packaging+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-packaging+owner@opensuse.org
participants (5)
-
Andreas Schwab -
Axel Braun -
Christoph Feck -
İsmail Dönmez -
Simon Lees