Hi Larry, Am 16.07.24 um 19:34 schrieb Larry Len Rainey:
I have built Virtualbox 7.0.20 and have built it on TW, 15.5 and 15.6 and tested it on Tumbleweed and 15.6 and want to check it in and I get this.
I have osc co home:larryr:branches:Virtualization/virtualbox and rebuilt it twice and still get this.
user@LLR3:~/home:larryr:branches:Virtualization/virtualbox> osc status M UserManual.pdf D VirtualBox-7.0.18-patched.tar.bz2 A VirtualBox-7.0.20-patched.tar.bz2 M fix_for_leap15.5.patch [...]> M virtualbox.changes M virtualbox.spec user@LLR3:~/home:larryr:branches:Virtualization/virtualbox> osc ci Working copy '/home/user/home:larryr:branches:Virtualization/virtualbox' is out of date (rev 2d6e100be4d7cdef3b3a0e431832a75b vs rev f5203d5a212f5c9bc57d1d42ee6c2f88). Looks as if you need to update it first.
First thing to try is "osc up", see if something gets a conflict during that update and if it does, fix the conflict and resolve it, then try again to commit. Conflicts will be indicated during osc up with C virtualbox.changes C virtualbox.spec You need to then edit the files, check for <<<<<< your changes ====== their changes >>>>>> resolve them and then mark the file as resolved with "osc resolved virtualbox.changes" This happens if someone changed the package after you last updated it. In this case of a branch in your home, probably the branched package has been updated, maybe just by an accepted submitrequest from Virtualization to Factory or such, which usually does just increase the checkin counter but not create any real conflicts. Real conflicts only occur if multiple people are doing changes to the package at the same time. Hope this helps a bit :-) You can also use the "smash everything with a big hammer" method that someone else suggested with deleting everything and trampling over the changes of others. But that should be the last resort IMVHO. Best regards and good luck, seife -- Stefan Seyfried "For a successful technology, reality must take precedence over public relations, for nature cannot be fooled." -- Richard Feynman