Make jj prev and jj next work when the working copy is a merge commit
#3461
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
emesterhazy
commented
Apr 5, 2024
emesterhazy
commented
Apr 5, 2024
|
@PhilipMetzger I think that this just works, and that the logic is actually a bit simpler now. You are probably the expert for this command though. Do you think there are any other scenarios we should test? |
emesterhazy
force-pushed
the
push-yssoqtwsntox
branch
from
09be1aa to
636c684
Compare
emesterhazy
changed the title
jj prev work when @ is a merge commitjj prev work when the working copy is a merge commit
emesterhazy
force-pushed
the
push-yssoqtwsntox
branch
2 times, most recently
from
c3ebf6c to
9909050
Compare
|
It looks like |
|
Yeah I can take a look at |
I would do it in the same PR but up to you since you're the one doing it. |
yuja
reviewed
Apr 6, 2024
emesterhazy
force-pushed
the
push-yssoqtwsntox
branch
from
9909050 to
12dcc69
Compare
emesterhazy
force-pushed
the
push-qwxwsrzwqtxy
branch
from
0f069ac to
e959102
Compare
emesterhazy
commented
Apr 7, 2024
emesterhazy
force-pushed
the
push-yssoqtwsntox
branch
from
12dcc69 to
2eab218
Compare
emesterhazy
changed the title
jj prev work when the working copy is a merge commitjj prev and jj next work when the working copy is a merge commit
|
I pushed a second commit that removes the merge commit limitation from |
emesterhazy
force-pushed
the
push-yssoqtwsntox
branch
from
15ad062 to
9d8303f
Compare
emesterhazy
force-pushed
the
push-qwxwsrzwqtxy
branch
from
e959102 to
bac9891
Compare
emesterhazy
force-pushed
the
push-yssoqtwsntox
branch
from
9d8303f to
2861044
Compare
emesterhazy
added a commit
that referenced
this pull request
Apr 8, 2024
…ts_at` The current documentation is wrong. This is a follow up for #3461 (comment)
emesterhazy
added a commit
that referenced
this pull request
Apr 8, 2024
…ts_at` The current documentation is wrong. This is a follow up for #3461 (comment)
emesterhazy
added a commit
that referenced
this pull request
Apr 8, 2024
…ts_at` The current documentation is wrong. This is a follow up for #3461 (comment)
emesterhazy
force-pushed
the
push-yssoqtwsntox
branch
from
2861044 to
457185c
Compare
Before this commit `jj prev` fails if the current working copy commit is a merge commit. After this commit it will prompt the user to choose the ancestor they want to select. #2126
emesterhazy
force-pushed
the
push-yssoqtwsntox
branch
from
457185c to
0bcfdc2
Compare
emesterhazy
force-pushed
the
push-yssoqtwsntox
branch
from
0bcfdc2 to
1222c78
Compare
|
Thanks everyone for helping to review this! |
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.
Before this commit
jj prevfails if the current working copy commit is a merge commit. After this commit it will prompt the user to choose the ancestor they want to select.#2126
Checklist
If applicable:
CHANGELOG.md