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.
This pull request addresses newline normalization issues, particularly around CRLF/LF mismatches on Windows, by ensuring files are always read from git objects rather than the working copy. It also removes tests that specifically checked CRLF preservation, as this is now handled by the new approach. Additionally, test setup code is updated for consistency in newline handling.
The most important changes are:
Core logic improvements (newline normalization):
pubgate/absorb.py, both_apply_absorb_changesand_merge_filenow read "ours" content directly from git objects instead of the working copy, preventing CRLF/LF mismatches during merges on Windows. This ensures consistent behavior regardless of platform. [1] [2]Test suite updates:
tests/conftest.pynow consistently specifiesnewline=""when writing text files, ensuring test repositories have predictable line endings. [1] [2] [3]TestAbsorbCRLFintests/test_absorb.pyandTestPublishCRLFintests/test_publish.py) are removed, as the new implementation makes these tests redundant. [1] [2]…ge operations