Repository navigation
fix(sync): keep fork-deleted files deleted through the upstream merge - #230
Merged
Merged
Conversation
A file deleted in the fork and listed in .fork-deleted conflicts whenever upstream edits it. rerere cannot record a modify/delete conflict. Each conflict stalled the weekly sync and triggered an issue for manual resolution. Issue 224 had 7 of its 28 conflicts of this kind. scripts/resolve-fork-deleted.py runs straight after the merge in upstream-sync.yml. It runs git rm on each unmerged path listed in .fork-deleted and deleted in the fork. Text conflicts and modify/delete on unlisted paths still stop the sync. Files deleted upstream and edited in the fork still stop the sync.
The .fork-deleted entry in what-we-changed.md says a listed path stays deleted through the sync. The sync still stops only for a text conflict or an upstream delete of a file we edited. The knip note says an unlisted removal still conflicts until its path is listed.
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.
The fork deliberately deletes 16 upstream workflows (.fork-deleted). Upstream edits one and the merge hits a modify/delete conflict. rerere can't record those.
The sync stops and files an issue for a person. #224 had 7 of its 28 conflicts like this.
git merge, before the "anything still conflicted" checkgit rms a path only if it is unmerged, listed in .fork-deleted (path or glob) and deleted on the forkDone when the next sync no longer files an issue for a fork-deleted file.