cli: op log/show: don't attempt to show diff from auto-merge parents #6743
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
Since merge_operations() may rebase descendants of the rewritten commits, it can't produce the exactly same results. jj-vcs#4465
A dummy merge shouldn't be visible to users. Only the merged view should matter.
Unfortunately, we can't reproduce a merge in bit-exact manner. The shape of the commits graphs should be identical, but commit/change ids differ. I don't think we would want to see the list of "identical" changes, so this patch disables show_op_diff() for merge operations. "op diff" is unchanged because it doesn't fail, and the diff functionality might be useful for debugging problems. Alternatively, we could show diff from the auto-merge state without rebasing descendants, but I don't think that would be useful either. The state before rebase_descendants() isn't visible to users, so it shouldn't be the stuff the user would care about. Fixes jj-vcs#4465
bnjmnt4n
approved these changes
Jun 11, 2025
martinvonz
approved these changes
Jun 11, 2025
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.
Fixes #4465
Checklist
If applicable:
CHANGELOG.mdREADME.md,docs/,demos/)cli/src/config-schema.json)