amend: Fix last-touched when deleting files - #276
Merged
Conversation
Collaborator
Author
Collaborator
Author
|
This was referenced Jul 23, 2026
jerry-skydio
force-pushed
the
jerry/revup/main/fixlasttouched
branch
from
July 27, 2026 20:47
d9e4421 to
f312003
Compare
jerry-skydio
force-pushed
the
jerry/revup/main/deletelasttouched
branch
2 times, most recently
from
July 27, 2026 20:52
b23066b to
fa73cdf
Compare
jerry-skydio
force-pushed
the
jerry/revup/main/fixlasttouched
branch
from
July 27, 2026 20:52
f312003 to
d6fce99
Compare
brian-kubisiak-skydio
approved these changes
Jul 27, 2026
Previously deleted files were not affected by this replay logic because they don't show up in the new index. Fix this by adding the old version of the deleted file to the base of the merge, so the merge-tree will treat it as deleted. Add a test for this.
jerry-skydio
force-pushed
the
jerry/revup/main/deletelasttouched
branch
from
July 27, 2026 20:54
fa73cdf to
258238b
Compare
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.
Previously deleted files were not affected by this replay
logic because they don't show up in the new index.
Fix this by adding the old version of the deleted file to
the base of the merge, so the merge-tree will treat it as
deleted. Add a test for this.