fix: sync.pl leaves clean working tree (protected files, excludes, no .orig)#396
Merged
Conversation
Mark the following files as protected in config.yaml so they will not be overwritten when running dev/import-perl5/sync.pl: - Pod/Perldoc.pm - has case-insensitive Pod/ directory search for JAR paths - Test/Harness.pm - filters out jar: paths from @inc for child processes - TAP/Parser/Iterator/Process.pm - handles missing fork in get_select_handles This prevents loss of PerlOnJava-specific patches when syncing from perl5. Generated with [Devin](https://cli.devin.ai/docs) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
- Add exclude option support to sync.pl for directory imports - Exclude build artifacts from perl5/pod: Makefile, buildtoc, etc. - Exclude broken symlinks: perllinux.pod, perlmacosx.pod, etc. (these point to ../README.* which do not exist in target) This prevents untracked files from being created after running sync.pl. Generated with [Devin](https://cli.devin.ai/docs) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
fglock
force-pushed
the
fix/jperldoc-protected-files
branch
from
6b6a8bf to
1c38fbc
Compare
Add --no-backup-if-mismatch to patch command to prevent creating Unix.pm.orig and similar backup files during sync. Generated with [Devin](https://cli.devin.ai/docs) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
fglock
changed the title
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.
Summary
This PR fixes the
dev/import-perl5/sync.plscript to leave a clean working tree after running.Changes
Protected files - Mark patched files as
protected: trueso they won't be overwritten:Pod/Perldoc.pm- case-insensitive Pod/ directory search for JAR pathsTest/Harness.pm- filters jar: paths from @incTAP/Parser/Iterator/Process.pm- handles missing forkExclude patterns - Add
excludeoption support to sync.pl for directory imports:.gitignore,Makefile,buildtoc, etc.perllinux.pod,perlmacosx.pod, etc. (pointing to non-existent../README.*files)No backup files - Use
--no-backup-if-mismatchin patch command to prevent creating.origfilesTest plan
makepassesperl dev/import-perl5/sync.plcompletes successfullygit statusshows clean working tree after sync./jperldoc perlfuncworksGenerated with Devin