Repository navigation
Conversation
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
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 new version of a recipe no longer ships a file,
recipes:updaterangit rmon it even if it had been modified in the app, then reported "No files were changed as a result of the update."Now,
RecipePatcher::generatePatch()compares the file in the app with the one copied by the original recipe:same content: the file is deleted, as before;
different content: the file is kept, and listed in a warning, like the files still referenced by other recipes:
Deleted files are now also taken into account to decide whether files were changed by the update.
Reporting this as a modify/delete conflict is not possible with
git apply, which is why deletions were moved out of the patch in the first place.I also fixed two tests:
testGeneratePatchcreated the app files withtouch(empty, so now seen as modified), andtestIntegrationchecked the deletion ofsecurity.yamlat the wrong path, so the assertion always passed.