[opensuse-kde] k3b in KDE:Distro:Stable in strange error state
Hi, the pkg k3b in KDE:Distro:Stable is hanging out in a strange error state: the Files page says: The link contains errors: conflict in file k3b.spec. The question is: how can a link contain conflicts? Shouldn't simply superseed a local existing file a linked one, e.g. k3b.spec in this case? Pete -- To unsubscribe, e-mail: opensuse-kde+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kde+help@opensuse.org
On Wednesday 28 July 2010 16:27:37 Hans-Peter Jansen wrote:
Hi,
the pkg k3b in KDE:Distro:Stable is hanging out in a strange error state: the Files page says: The link contains errors: conflict in file k3b.spec.
The question is: how can a link contain conflicts?
use "osc up ; osc pull" ... fixing conflicts " osc resolved; osc ci" way by default.
Shouldn't simply superseed a local existing file a linked one, e.g. k3b.spec in this case?
By default we have branches which get merged together via a diff3 approach. This makes sense because you usually want to be able to submit your local changes later on to the one you derived the package from. So OBS tries always to merge the code streams when building packages. If you don't want that do a full copy of a package and not a branch. bye adrian -- Adrian Schroeter SUSE Linux Products GmbH email: adrian@suse.de -- To unsubscribe, e-mail: opensuse-kde+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kde+help@opensuse.org
On Thursday 29 July 2010, 06:32:23 Adrian Schröter wrote:
On Wednesday 28 July 2010 16:27:37 Hans-Peter Jansen wrote:
Hi,
the pkg k3b in KDE:Distro:Stable is hanging out in a strange error state: the Files page says: The link contains errors: conflict in file k3b.spec.
The question is: how can a link contain conflicts?
use "osc up ; osc pull" ... fixing conflicts " osc resolved; osc ci" way by default.
Adrian, thanks for the explanation. of course, it makes complete sense to try to merge the packages. It might be worth rephrasing that expression. How do you like: Merging the linked package failed: conflict in file k3b.spec. Unfortunately, it's not possible to branch a package in this state in order to sr the changes to the maintainers. I guess, there's a valid reason for this restriction, but it would be nice to overrule this with osc branch --force. BTW, it looks like BS stalls on build of KDE:Distro:Stable/kdepimlibs4 for 11.1/x86_64 since yesterday. (Hanging in state building, while the build log keeps being empty..) Cheers, Pete -- To unsubscribe, e-mail: opensuse-kde+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-kde+help@opensuse.org
participants (2)
-
Adrian Schröter -
Hans-Peter Jansen