-
Notifications
You must be signed in to change notification settings - Fork 750
prev/next: add an error when not using --edit and the working-copy has children #7690
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
Open
glehmann
wants to merge
1
commit into
jj-vcs:main
Choose a base branch
from
glehmann:gln/no-edit-children-error-pxlp
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
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
a77c40b
to
2f9af19
Compare
martinvonz
reviewed
Oct 10, 2025
2f9af19
to
db7641a
Compare
I'm fine with this patch even though I raised some concerns in the aforementioned issue. Maybe this will make it more intuitive to users so LGTM. |
be6b9ae
to
2a47b55
Compare
martinvonz
reviewed
Oct 13, 2025
2a47b55
to
8bbaccf
Compare
martinvonz
approved these changes
Oct 14, 2025
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
b18d0d2
to
6235b23
Compare
…s children We shouldn't be in that case, and it can lead to confusing situations with next completely switching branch. fix: jj-vcs#7046
6235b23
to
309a4e7
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.
We shouldn't be in that case, and it can lead to confusing situations with next completely switching branch.
fix: #7046
Checklist
If applicable:
CHANGELOG.md
README.md
,docs/
,demos/
)cli/src/config-schema.json
)