On Fri, 23 Mar 2012 16:56:41 +0100 Ruediger Meier <sweet_f_a@gmx.de> wrote:

Hi,

My llvm29 package shows broken suddenly: https://build.opensuse.org/package/show?package=llvm29&project=home%3Arudi_m

error: "conflict in file llvm.spec"

Don't even know why it complains about llvm.spec since it's called llvm29.spec according to the package name. I haven't changed that package for weeks. And it was ok until yesterday.

cu, Rudi Hi Probably the _link you have and this change? https://build.opensuse.org/request/show/110700

-- Cheers Malcolm °¿° (Linux Counter #276890) SUSE Linux Enterprise Desktop 11 (x86_64) Kernel 3.0.13-0.27-default up 1 day 2:07, 2 users, load average: 0.00, 0.02, 0.05 CPU Intel i5 CPU M520@2.40GHz | Intel Arrandale GPU -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org

On Fri, Mar 23, 2012 at 04:56:41PM +0100, Ruediger Meier wrote:

My llvm29 package shows broken suddenly: https://build.opensuse.org/package/show?package=llvm29&project=home%3Arudi_m

error: "conflict in file llvm.spec"

Don't even know why it complains about llvm.spec since it's called llvm29.spec according to the package name. I haven't changed that package for weeks. And it was ok until yesterday.

Well, you link against devel:tools:compiler/llvm, and that package changed. The 3-way merge for the llvm.spec file failed. Basically, you changed llvm.spec (by deleteing it), and yesterday the llvm.spec file changed in devel:tools:compiler. Thus the build service doesn't know how to merge this changes. (You habe the same problem in version control systems like git.) It's easy to fix this, just do a checkout with osc, and then use 'osc pull' to repair the link. Cheers, Michael. -- Michael Schroeder mls@suse.de SUSE LINUX Products GmbH, GF Jeff Hawn, HRB 16746 AG Nuernberg main(_){while(_=~getchar())putchar(~_-1/(~(_|32)/13*2-11)*13);} -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org