Tue, 14 Dec 2021 16:09:28 +0100 Marcus Hüwe :

Run "osc pull"

Is this going to be the norm from now on, to simulate "baserev update by copy to link target" from user buildservice-autocommit? I mean, meanwhile I'm doing this step manually, it is just slightly cumbersome... Olaf

On Tue, Dec 14, 2021 at 05:30:51PM +0100, Marcus Hüwe wrote:

On 2021-12-14 16:29:53 +0100, Olaf Hering wrote:

...

Tue, 14 Dec 2021 16:09:28 +0100 Marcus Hüwe :

...

Run "osc pull"

Is this going to be the norm from now on, to simulate "baserev update by copy to link target" from user buildservice-autocommit? I mean, meanwhile I'm doing this step manually, it is just slightly cumbersome...

Ugh... To "mitigate" the accept unreviewed sources issue [1] certain projects like openSUSE:Factory have the OBS:EnforceRevisionsInRequests attribute set (that is, always store an expanded rev in a request's submit action). The downside of this is that when accepting the request, the source _link's baserev is not updated anymore:/ I agree, this is probably really annoying:/

It's also most likely a bug. It should still update the baserev is the srcmd5 matches the top commit. Cheers, Michael. -- Michael Schroeder SUSE Software Solutions Germany GmbH mls@suse.de GF: Felix Imendoerffer HRB 36809, AG Nuernberg main(_){while(_=~getchar())putchar(~_-1/(~(_|32)/13*2-11)*13);}

Hi, On 12/14/21 4:09 PM, Marcus Hüwe wrote:

Hi,

On 2021-12-14 14:38:09 +0100, Michael Pujos wrote:

...

I have pushed a commit to this package:

https://build.opensuse.org/package/show/multimedia:apps/upmpdcli

The web interface reports:

Files could not be expanded: service error: bad link: conflict in file upmpdcli.spec

I have no idea how this error happened and how to fix it. I just modified like 2 lines in upmpdcli.spec.

Any help ? Run "osc pull" inside the the checked out package, fix the conflicts (see "osc st" for files that have a conflict ("C")), run "osc resolved ..." and commit the changes via "osc ci".

I have the same issue, but running `osc pull` does not solve it: $ osc pull Link "devel:languages:python/diffoscope" cannot be expanded:  conflict in file diffoscope.spec Use "osc repairlink" to fix merge conflicts. $ osc repairlink BuildService API error: source link is not broken $ osc up Link "devel:languages:python/diffoscope" cannot be expanded:  conflict in file diffoscope.spec Use "osc repairlink" to fix merge conflicts. I go around in circles. Thanks in advance Sebastian