cli rebase: add tests for weird ancestry, fix an assumption in a comment
#2644
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
ilyagr
changed the title
rebase -r: add tests for weird ancestry, fix an assumption in a comment
ilyagr
force-pushed
the
rebasetest
branch
2 times, most recently
from
b692fdc to
21eb893
Compare
|
To elaborate on the "Aside" in the PR description, #2646 would be the first step of that plan. All the tests introduced here pass with that PR as well. |
ilyagr
force-pushed
the
rebasetest
branch
2 times, most recently
from
e604ec6 to
8e8e70d
Compare
yuja
approved these changes
Nov 28, 2023
ilyagr
commented
Nov 29, 2023
ilyagr
force-pushed
the
rebasetest
branch
2 times, most recently
from
af15dfa to
153f27a
Compare
ilyagr
changed the title
rebase -r: add tests for weird ancestry, fix an assumption in a commentrebase: add tests for weird ancestry, fix an assumption in a comment
ilyagr
force-pushed
the
rebasetest
branch
4 times, most recently
from
d51eb11 to
0b3efd3
Compare
Note that one of the new tests panics; this is a newly discovered bug. In Git, a commit's direct parent is allowed to also be an indirect ancestor at the same time. `jj` currently tries to prevent this situation, but does allow it. The correctness of `rebase -r A -d descendant_of_A` currently depends on this jj-specific behavior; we should change that. Cc jj-vcs#2600
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.
In Git, a commit's direct parent is allowed to also be an indirect ancestor at the same time.
jjcurrently tries to prevent this situation, but does allow it. The correctness ofrebase -r A -d descendant_of_Acurrently depends on this jj-specific behavior; we should change that.Cc #2600
Aside: I have plans to refactor jj rebase -r so that it becomes straightforward to conclude that it does not block fixing #2600, hopefully in the near future. It's slowed down slightly by my wanting to refactor
jj newand DescendantRebaser at the same time and have them all use the same code.Checklist
If applicable:
CHANGELOG.md