[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@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
Olaf Hering <olaf@aepfle.de> writes:
What is the prefered way to merge changes in the devel project?
osc pull Andreas. -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different." -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
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 -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
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. -- Andreas Schwab, schwab@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org
participants (3)
-
Andreas Schwab -
Andreas Schwab -
Olaf Hering