amend: Fix last-touched functionality#267
Open
jerry-skydio wants to merge 1 commit into
Open
Conversation
Collaborator
Author
|
Reviews in this chain: |
Collaborator
Author
jerry-skydio
force-pushed
the
jerry/revup/main/fixlasttouched
branch
from
8c729e8 to
9279b2f
Compare
last-touched will amend the file into the correct commit, but incorrectly then removes the changes immediately when replaying the rest of the stack on top. This was not caught by tests because those only checked the exact commit and file, without checking that the rest of the stack is correct. Fix this by reimplementing with the merge-tree engine, which is more modern and faster anyway. Update tests to catch this case.
jerry-skydio
force-pushed
the
jerry/revup/main/fixlasttouched
branch
from
9279b2f to
6f491aa
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
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.
last-touched will amend the file into the correct
commit, but incorrectly then removes the changes immediately
when replaying the rest of the stack on top. This was not
caught by tests because those only checked the exact commit
and file, without checking that the rest of the stack is
correct.
Fix this by reimplementing with the merge-tree engine, which
is more modern and faster anyway. Update tests to catch this case.