Repository navigation
xdrip_cgm: update nextdev patch for current next-dev - #91
Merged
Merged
Conversation
Loop next-dev PR LoopKit/Loop#2572 (plugin picker sheet with manufacturer groups and subtitles) reworked SettingsView, so nextdev_basal_lock.patch stopped applying. Rebase the SettingsView hunks onto the plugin picker and move the old patch to basal_lock/archive/nextdev_basal_lock_20d597f.patch, named for the last Loop commit it applied to. The rebased patch applies on top of nextdev_profiles.patch and vice versa, so no next-dev combination patches are needed.
Next-dev replaced the LibreCRKit submodule with RoundWhiteDiscKit, so the nextdev patch no longer applied and the main/dev patch was used instead, which fails to build on next-dev. The patch makes the same change with updated context. The old patch is moved to the archive, named for the last LoopWorkspace commit it applied to.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Next-dev replaced the LibreCRKit submodule with RoundWhiteDiscKit, so the nextdev xdrip_cgm patch stopped applying. The script then used the main/dev patch instead, which fails to build on next-dev. This updates the nextdev patch so it applies again and archives the old one. It builds on the current next-dev, and main and dev still get their own patch.
Stacked on #89.