locator: correctly reject patches adding a file for non-empty files #67
Conversation
This file contains 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
We were not correctly considering the case that the old file was empty. To fix this, use the same logic as what is used in the locator to determine the expected file location when printing this information.
This corrects the actual logic needed to fix the: `applier_add_file_but_file_already_exits_with_conflicts` test. We just need to also add an informational message about when this case is detected.
Codecov ReportAll modified and coverable lines are covered by tests ✅
❗ Your organization needs to install the Codecov GitHub app to enable full functionality. Additional details and impacted files@@ Coverage Diff @@
## main #67 +/- ##
==========================================
+ Coverage 89.71% 89.72% +0.01%
==========================================
Files 19 19
Lines 2033 2035 +2
Branches 872 873 +1
==========================================
+ Hits 1824 1826 +2
Misses 77 77
Partials 132 132 ☔ View full report in Codecov by Sentry. |
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.
This corrects the actual logic needed to fix the:
applier_add_file_but_file_already_exits_with_conflictstest.We just need to also add an informational message about when this case
is detected.