On 06/29/2018 02:43 PM, Axel Braun wrote:
Same was just discussed here: https://lists.opensuse.org/opensuse-packaging/2018-06/msg00012.html
Am Freitag, 29. Juni 2018, 21:33:14 CEST schrieb David C. Rankin:
All,
Need a little help with build service. I branched firefox-esr to my build service to build 52.8.1 which built fine originally. I went back today to update sources and spec for 52.9.0 and now build service is telling me:
Sources could not be expanded: conflict in file firefox-esr.spec
Why is there a conflict? Of course I had to update the .spec to change versions and sources for
firefox-52.8.1-source.tar.xz l10n-52.8.1.tar.xz
and now
firefox-52.9.0-source.tar.xz l10n-52.9.0.tar.xz
How do I tell it "Yes, these are the changes I want in my repo?"
https://build.opensuse.org/package/show/home:drankinatty:branches:mozilla/fi refox52esr?expand=0
Do I need to delete this branch and re-branch firefox-esr again?
Thank you Axel, That is the frustrating part. If I was using osc locally for firefox-esr, that wouldn't be an issue, but I am only using build-service here. I didn't want to create a local osc build which duplicates the 200M+ source file both in the osc dir as well as in the firefox mercurial repository locally. I'll try and find a way to only transfer the .spec, but if you have any tips or help there, I'd appreciate it. This should really be something that should be easily handled with the web-interface alone. Thanks again. You have pointed me in the right direction. -- David C. Rankin, J.D.,P.E. -- To unsubscribe, e-mail: opensuse-factory+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-factory+owner@opensuse.org