Mailinglist Archive: opensuse-buildservice (91 mails)

< Previous Next >
[opensuse-buildservice] merge changes from devel project
What is the prefered way to merge changes in the devel project?

osc bco pkg
cd home:user:devel:prj/pkg
osc up -u
edit pkg.spec
osc vc
osc commit

now devel:prj/pkg gets changes by someone else, and
home:user:devel:prj/pkg goes into state 'broken':
broken: conflict in file pkg.spec

Even if the changes are merged manually the pkg remains broken.
I think its required to just update the _link to point to HEAD.
Is there a command to do just that? osc repairlink says:
BuildService API error: source link is not broken


Olaf
--
To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@xxxxxxxxxxxx
To contact the owner, e-mail: opensuse-buildservice+owner@xxxxxxxxxxxx

< Previous Next >
Follow Ups