push: enable building conflicting livepatches#205
Draft
vmezzela wants to merge 1 commit intoSUSE:develfrom
Draft
push: enable building conflicting livepatches#205vmezzela wants to merge 1 commit intoSUSE:develfrom
vmezzela wants to merge 1 commit intoSUSE:develfrom
Conversation
When a livepatch conflicts with a previous one that patches the same affected function, the usual workflow cannot be used. In this case, the diff is going to be applied directly of top of the previous conflicting bsc directory, rather than creating a new bsc directory for the current bsc. This means that we cannot use master-livepatch branch as a base to create the bsc directory and then rebase it appropriately on the affected product branches. Instead, for each group, we'd need to work on a product branch so that we have the previous conflicting bsc directory as a base where we can apply the diff and then commit it. With this patch, it's possible to take that commit and apply it to the others product branches that belongs to the same group before pushing to IBS. Signed-off-by: Vincenzo Mezzela <vincenzo.mezzela@suse.com>
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
1 participant
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.
When a livepatch conflicts with a previous one that patches the same affected function, the usual workflow cannot be used.
In this case, the diff is going to be applied directly of top of the previous conflicting bsc directory, rather than creating a new bsc directory for the current bsc.
This means that we cannot use master-livepatch branch as a base to create the bsc directory and then rebase it appropriately on the affected product branches. Instead, for each group, we'd need to work on a product branch so that we have the previous conflicting bsc directory as a base where we can apply the diff and then commit it.
With this patch, it's possible to take that commit and apply it to the others product branches that belongs to the same group before pushing to IBS.
My idea is not to have this merged now, but to keep this branch here as a reference when someone will happen to work on a conflicting livepatch and have trouble building. I haven't tested how this change works with normal livepatches.