Re: osc branch of revision results in error
Hi Adrian, Am Dienstag, 29. März 2022, 16:33:29 CEST schrieb Adrian Schröter:
On Dienstag, 29. März 2022, 16:29:16 CEST Axel Braun wrote:
Hi Adrian,
Am Dienstag, 29. März 2022, 16:10:24 CEST schrieben Sie:
On Dienstag, 29. März 2022, 16:07:13 CEST Axel Braun wrote:
Hi,
when I branch an earlier revision of a package like
osc branch -r 36 -f devel:languages:python python-cairocffi <target>
that revision points to the current revision of the package in openSUSE:Factory.
The version in Factory is the latest - rev. 39 in d:l:p
exactly, but you can merge that one into the old 36 revision.
And how?
So this is causing this conflict:
I get the error:
BuildService API error: failed to branch: conflict in file python- cairocffi.spec
Well, it is expected that the spec file of the reveision deviates from the actual package. So how can I branch an earlier version?
You need to have a mergeable revision or in most cases just pick one from
osc buildhist ...
osc buildhist devel:languages:python python-cairocffi 15.4 x86_64 time srcmd5 vers-rel.bcnt rev duration 2022-01-10 14:57:01 1843103fad445f3d497afca4bae8a582 1.3.0-43.1 39 53 2022-01-14 18:43:47 3e7538a12438c0f6d38af68f07bca8e6 1.3.0-44.1 39 75 2022-02-09 07:31:29 3e7538a12438c0f6d38af68f07bca8e6 1.3.0-44.2 39 41
-> all of the current release, that will not help
15.4 is a new repo, check with 15.3 repo.
That goes back to rev. 38, but not beyond (tried with a higher -l as well) Cheers Axel
On Dienstag, 29. März 2022, 16:36:25 CEST Axel Braun wrote:
Hi Adrian,
Am Dienstag, 29. März 2022, 16:33:29 CEST schrieb Adrian Schröter:
On Dienstag, 29. März 2022, 16:29:16 CEST Axel Braun wrote:
Hi Adrian,
Am Dienstag, 29. März 2022, 16:10:24 CEST schrieben Sie:
On Dienstag, 29. März 2022, 16:07:13 CEST Axel Braun wrote:
Hi,
when I branch an earlier revision of a package like
osc branch -r 36 -f devel:languages:python python-cairocffi <target>
that revision points to the current revision of the package in openSUSE:Factory.
The version in Factory is the latest - rev. 39 in d:l:p
exactly, but you can merge that one into the old 36 revision.
And how?
erm, sorry, I forgot the quite important "not" in that sentence...
So this is causing this conflict:
I get the error:
BuildService API error: failed to branch: conflict in file python- cairocffi.spec
Well, it is expected that the spec file of the reveision deviates from the actual package. So how can I branch an earlier version?
You need to have a mergeable revision or in most cases just pick one from
osc buildhist ...
osc buildhist devel:languages:python python-cairocffi 15.4 x86_64 time srcmd5 vers-rel.bcnt rev duration 2022-01-10 14:57:01 1843103fad445f3d497afca4bae8a582 1.3.0-43.1 39 53 2022-01-14 18:43:47 3e7538a12438c0f6d38af68f07bca8e6 1.3.0-44.1 39 75 2022-02-09 07:31:29 3e7538a12438c0f6d38af68f07bca8e6 1.3.0-44.2 39 41
-> all of the current release, that will not help
15.4 is a new repo, check with 15.3 repo.
That goes back to rev. 38, but not beyond (tried with a higher -l as well)
okay, then either osc buildhist devel:languages:python python-cairocffi SLE_15_SP2 x86_64 or you just use the revision of factory which was there when revision 36 was committed into your devel project: osc up -r 36 --linkrev=base In this case it is unlikely that factory has changed when revision stayed at 36 in devel project -- Adrian Schroeter <adrian@suse.de> Build Infrastructure Project Manager SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Ivo Totev
participants (2)
-
Adrian Schröter -
Axel Braun