On Dienstag, 11. November 2014, 11:10:52 wrote Greg Freemyer:
All,
Given merge conflicts in an older package revision, how can I branch the older revision of the package regardless?
The error comes often from the situation that also the old version did point to some current version of a package, which leads to merge conflicts. So, you need to specify an exact reversion, for example by looking in the DISTURL of an existing rpm or by checking the buildhistory: osc buildhistory .... shows only successfull builds (and therefore also the source merge must have worked). You can pick any of these md5sums and use them as revision for branching. bye adrian
== details For one of my tools I need to have python-psutil v1.2.1 available in my repo.
That is in rev 26 of d:l:p python-psutil, so I tried:
osc bco -r 26 devel:languages:python python-psutil
But I'm getting an error:
"Server returned an error: HTTP Error 400: Bad Request conflict in file python-psutil.spec"
Adding -f (force) doesn't help.
-- For now I just used "osc mkpac" to create a new package and populated it with the old files, but branching the old revision I assume is preferred.
Thanks Greg -- Greg Freemyer
-- Adrian Schroeter email: adrian@suse.de SUSE LINUX GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 21284 (AG Nürnberg) Maxfeldstraße 5 90409 Nürnberg Germany -- To unsubscribe, e-mail: opensuse-packaging+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-packaging+owner@opensuse.org