Update to version 3.16.17 and merge changes from PR #13 #14
Reference in New Issue
Block a user
Delete Branch "ateixeira/gamescope:factory"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
Update to version 3.16.17
This PR also manually merges the changes from #13 . It was accepted in Factory but the changes were lost in the git repo because the source branch was deleted before the PR was merged (see #13 (comment)). Not sure if this should be solved in some other way.
Created submit request sr#1306027
Thanks ateixeira for fixing up my mistake - I guess we have "hole" here in the process making my mistake possible.
I also wonder why your pull automagically triggered src-o-org-forwarder doing the "SR"? - mine needed manual interventions, and the SR was from someone else towards factory.
That's because Factory is not yet using the git workflow. Changes to Factory should be submitted "as usual": first, land the change in the devel project, second, SR from devel to openSUSE:Factory.
It looks like the forwarded SR ( https://build.opensuse.org/requests/1306027 ) was accepted in this case, though!
But should this merge not be acked?
Now there is a diff in the devel repo vs factory?
With factory beeing 2 commits ahead.
See
osc rdiff openSUSE:Factory gamescope games:tools gamescopeYes, the repo for this package was set up with git quite a few months ago at a point when it was experimental and the existing guide I had at the time directed maintainers towards doing the scmsync config in the devel project. (see: https://en.opensuse.org/openSUSE:OBS_with_Git#Warnings_about_the_scm-staging_user_guide)
So, should I remove the scmsync config entirely and just use OBS for now until Factory starts using the git workflow?
Created submit request sr#1306878
If I understand correctly, the devel project https://build.opensuse.org/project/show/games:tools has not been migrated to git, but just the gamescope package within it has scmsync in its OBS package metadata.
I guess that explains why the Factory SR was accepted in this case.
I believe it should be possible to do
osc sr game:tools gamescope openSUSE:Factoryas usual, even when the package has scmsync. Have you tried that?The
factorybranch of this git repo should be automatically synced withopenSUSE:Factory/gamescope. It's possible that there might be a delay, though, which would explain whyfactorybranch fell behind when sr#1306878 was accepted.@ateixeira If you can merge this, please feel free to do so... (I cannot merge it in its current state). But I still think the factory branch will eventually get synced even without merging this PR.
Adding @adamm and @dirkmueller - what went wrong here? - aka did we do something wrong? #13 (comment) states that the devel repo should have been updated when the sr / merge was acked into factory?
the bot syncing from openSUSE:Factory to src.o.o/pool/ seems to have missed the package having changed in openSUSE:Factory - and as a consequence, the devel project (which uses an scmsync URL to pool - which is weird on its own) does not get the update
https://build.opensuse.org/package/show/games:tools/gamescope -> now broken
Pull request closed