-
Notifications
You must be signed in to change notification settings - Fork 263
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update error message when no movement target is found. #4284
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
feb66f0
to
379b33b
Compare
f067ef5
to
6ecc2da
Compare
1a73a47
to
2fcbb68
Compare
62c0187
to
75b7379
Compare
2fcbb68
to
43c3e3f
Compare
martinvonz
previously approved these changes
Aug 16, 2024
martinvonz
reviewed
Aug 16, 2024
75b7379
to
7058399
Compare
92730f0
to
63d516b
Compare
7058399
to
100991e
Compare
Undoing approval until we've figured out what to do about commits with more than 1 parent
63d516b
to
c534c21
Compare
100991e
to
e395474
Compare
c534c21
to
e76ec87
Compare
e395474
to
9ea300d
Compare
944bd6a
to
d0c7cc3
Compare
9ea300d
to
c513edf
Compare
d0c7cc3
to
2661065
Compare
c513edf
to
c3bf86e
Compare
80cf4d2
to
666be54
Compare
9957ca5
to
eb78142
Compare
666be54
to
41714af
Compare
eb78142
to
0dde77f
Compare
41714af
to
7173dd9
Compare
0dde77f
to
c639970
Compare
7173dd9
to
f0d6c53
Compare
c639970
to
09535dc
Compare
429d9e9
to
3742158
Compare
09535dc
to
b5cbfaa
Compare
9c9da31
to
3a3d234
Compare
yuja
reviewed
Aug 23, 2024
1d8e082
to
fe7a206
Compare
1c3b69e
to
3bd14c8
Compare
yuja
approved these changes
Aug 25, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks!
If movement commands don't find a target commit, they fail. However, it's usually not intuitive why they fail because in non-edit mode the start commit is the parent of the working commit. Adding the start commit change hash to the error message makes it easier for the user to figure out what is going on. Also, specifying 'No **other** descendant...' helps make it clear what `jj` is really looking for. Part of #3947
3bd14c8
to
30c4a88
Compare
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.
If movement commands don't find a target commit, they fail. However,
it's usually not intuitive why they fail because in non-edit mode the
start commit is the parent of the working commit.
Adding the start commit change hash to the error message makes it easier
for the user to figure out what is going on.
Part of #3947
Checklist
If applicable:
CHANGELOG.md