Distinguish files with identical contents #1882
Merged
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.
Currently Merlin's locate query uses a digest of the contents of a file to disambiguate files with the same name. If two files have the same digest, one is arbitrarily chosen. This can lead to Merlin confusing two files with identical contents. (See test case demonstrating the issue in the first commit.)
This PR resolves this issue by using a heuristic when multiple digests match. In a nutshell, it chooses the file whose path is most similar to the path of the build artifact it is trying to be matched to. See the comment in
locate.ml
for more detail.