On 04/04/2013 11:34 PM, Bernhard Voelker wrote:
On 04/04/2013 11:25 PM, Dimstar / Dominique Leuenberger wrote:
The issue is that the .spec file in any of the 'parent' projects was changed.. and branches inherit these changes and those happen to conflict now...
ah, mmeister changed something I wasn't aware of. Well, the error message is quite irritating ... at least in the web UI of OBS you don't have the chance to see what's wrong in the spec file.
Thanks!
Hmm, the merging via 'osc pull' only worked for propagating the changes from Base:System/coreutils to home:bernhard-voelker:bleeding_edge/coreutils, but it then fails for pulling in the changes to bleeding_edge+su/coreutils: $ osc pull Server returned an error: HTTP Error 400: home bernhard-voelker bleeding_edge/coreutils conflict in file coreutils.spec home:bernhard-voelker:bleeding_edge/coreutils: conflict in file coreutils.spec Any ideas? Okay, I could start over with a new project based on Base:System and use then use the working tree from my old checkout, but that can't be the proper solution. Have a nice day, Berny -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org