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
Olaf Hering olaf@aepfle.de writes:
What is the prefered way to merge changes in the devel project?
osc pull
Andreas.
On Wed, Dec 16, Olaf Hering wrote:
What is the prefered way to merge changes in the devel project?
The question still stands. The suggested 'osc pull' does not seem to work for me, with TW:
olaf@esprimo: home:olh:branches:Virtualization/qemu $ obs pull osc pull makes only sense with a detached head, did you mean osc up? olaf@esprimo: home:olh:branches:Virtualization/qemu $ obs up At revision 6. olaf@esprimo: home:olh:branches:Virtualization/qemu $ cat _link <link project="Virtualization" baserev="77907a5a30e00b699cdf744e6c2339e1"> <patches> <branch/> </patches> </link>
Olaf
Olaf Hering olaf@aepfle.de writes:
On Wed, Dec 16, Olaf Hering wrote:
What is the prefered way to merge changes in the devel project?
The question still stands. The suggested 'osc pull' does not seem to work for me, with TW:
An unexpanded working directory cannot have conflicts. You need to expand first.
Andreas.
buildservice@lists.opensuse.org
-
Andreas Schwab -
Andreas Schwab -
Olaf Hering