Mailinglist Archive: opensuse-buildservice (332 mails)

< Previous Next >
Re: [opensuse-buildservice] k3b in KDE:Distro:Stable in strange error state
  • From: Adrian Schröter <adrian@xxxxxxx>
  • Date: Thu, 29 Jul 2010 06:32:23 +0200
  • Message-id: <201007290632.23787.adrian@xxxxxxx>
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@xxxxxxx
--
To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-buildservice+help@xxxxxxxxxxxx

< Previous Next >
Follow Ups
References