Fix the test_git_colocated_fetch_deleted_branch test
#1599
Merged
Conversation
This file contains 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
yuja
approved these changes
May 11, 2023
There was a problem hiding this comment.
Before, HEAD@git was at change
e1f4mentioned in the test. So, in spite
of what the comment in the test says, that change should NOT have been
abandoned after the fetch and the test did not demonstrate a bug.
The change LGTM, but I'm not certain that the tested scenario was wrong. It might be better to abandon the deleted branch and rebase off the working copy commit (as it would be done in non-colocated repo), but that would disagree with the change 20eb9ec.
|
I'm not sure which behavior is best here, but the fact that it's not obvious is a good point. Thanks for the reference; I'll put it in my commit description before merging this. |
Before, HEAD@git was at change `e1f4` mentioned in the test. So, as long as we consider the behavior added in 20eb9ec to be correct, that change should NOT have been abandoned after the fetch, in spite of what the comment in the test says. In other words, the test did NOT demonstrate a bug before this commit. Now, the test properly demonstrates the bug. Cc jj-vcs#864
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.
Cc: #864