On Montag, 11. Februar 2019, 12:06:04 CET Eduardo Navarro wrote:

Hi,

I had a look with one of my coleagues. It looks like your package links to an older revision (rev60) of the network / gajim package (see the _link file of your package[1]), which seems to be broken (conflict in gajim.spec).

We don't know of any way to fix this particular conflict, but we noticed that revision 61 wouldn't cause any conflict. So we would recommend to check out this revision instead. This is basically the "merge commit" that brought in the changes of the previous revision (made by request 650198 [3]). It does not contain any additional changes.

osc pull is the way to go. However, in your case the conflict is not in your package, but in the package you branch from. So it needs to be fixed in "network" project.

Greetings,

Eduardo J.

[1] https://build.opensuse.org/package/view_file/home:ojkastl_buildservice:Playg round/gajim/_link?expand=0 [2] https://build.opensuse.org/package/revisions/network/gajim [3] https://build.opensuse.org/request/show/650198

On 2/7/19 9:08 PM, Johannes Kastl wrote:

...

Hi all,

is there a more detailed documentation on how to fix broken links, without removing the actual package?

I have copied the package in question to another project, seems like everything got copied fine, as this is still broken: home:ojkastl_buildservice:Playground/gajim

Kind Regards, Johannes

############# osc up said: ############# checking out new package gajim A gajim

The link in this package ("gajim") is currently broken. Checking out the last working version instead; please use 'osc pull' to merge the conflicts.

A gajim/gajim-1.1.2.tar.bz2 A gajim/gajim.changes A gajim/gajim.spec At revision 8a4018c87082a2733d5e43f072ce6f91.

############# osc pull yielded nothing: ############# Server returned an error: HTTP Error 400: service error bad link network/gajim conflict in file gajim.spec service error: bad link: network/gajim: conflict in file gajim.spec

############# osc repairlink said: ############# using link target of last commit Server returned an error: HTTP Error 400: service error bad link network/gajim conflict in file gajim.spec service error: bad link: network/gajim: conflict in file gajim.spec

############# osc repairwc ############# osc: working copy '.' is not inconsistent

curl -u ojkastl_buildservice https://api.opensuse.org/source/home:ojkastl_buildservice:Playground/gajim Enter host password for user 'ojkastl_buildservice': <directory name="gajim" rev="1" vrev="1" srcmd5="c1f2a2ba38324130468a3c27aa67e6a1">

rev="f7227d2288bc46be98d8cca07d1e59da" baserev="45aafcd4bb60a866384f3d9837602c40" error="network/gajim: conflict in file gajim.spec" />

<serviceinfo code="failed" xsrcmd5="527c534cc16c4b066cae45f536f896ff">

<error>service error: bad link: network/gajim: conflict in file

gajim.spec</error>

</serviceinfo>

mtime="1548680020" />

md5="de27bf88708a88527ef03e4c33e5ee2a" size="8003608" mtime="1548160178" />

size="18652" mtime="1548160178" />

size="4771" mtime="1548681271" /> </directory>

-- Adrian Schroeter SUSE Linux Products GmbH, Maxfeldstr. 5, 90409 Nuernberg, Germany email: adrian@suse.de -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org

On Dienstag, 12. Februar 2019, 20:55:10 CET Johannes Kastl wrote:

Adrian Schröter schrieb:

[description of broken package]

...

osc pull

is the way to go.

Which is the obvious choice, which I had tried and did not work.

...

However, in your case the conflict is not in your package, but in the package you branch from. So it needs to be fixed in "network" project.

So, this leaves me stuck with a broken package...

I'll try Eduardo's hint regarding the revision, I am just not sure how to exactly do that.

The problem has changed meanwhile. You have set a manual revision now pointing to revision which does not exist. (And no, this does not happen on merging). you can solve this by removing the fixed revsion via osc setlinkrev -u osc up -e -- Adrian Schroeter SUSE Linux Products GmbH, Maxfeldstr. 5, 90409 Nuernberg, Germany email: adrian@suse.de -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org

Hi again, On 2/12/19 8:53 PM, Johannes Kastl wrote:

Hi Eduardo,

thanks for taking the time to dig into this.

Eduardo Navarro schrieb:

...

I had a look with one of my coleagues. It looks like your package links to an older revision (rev60) of the network / gajim package (see the _link file of your package[1]), which seems to be broken (conflict in gajim.spec).

OK, funny.

...

We don't know of any way to fix this particular conflict, but we noticed that revision 61 wouldn't cause any conflict. So we would recommend to check out this revision instead. This is basically the "merge commit" that brought in the changes of the previous revision (made by request 650198 [3]). It does not contain any additional changes.

OK, and how to exactly do that? As I wrote, everything I had tried failed...

osc setlinkrev -r 61 Anyway, I would feel more sure following Adrian's advice. Greetings, Eduardo J. -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org