cli: merge_tools/external: bail out if the files are the same when re-reading conflicts - #9984
Open
winterqt wants to merge 1 commit into
Open
cli: merge_tools/external: bail out if the files are the same when re-reading conflicts#9984winterqt wants to merge 1 commit into
winterqt wants to merge 1 commit into
Conversation
…-reading conflicts Previously, we were always updating the tree, even if the files were unchanged by the external editor. Fixes #9138.
winterqt
force-pushed
the
push-smnstoxmwxmv
branch
from
August 14, 2026 01:07
9be1d98 to
6330dff
Compare
winterqt
commented
Aug 14, 2026
| }; | ||
|
|
||
| if new_file_ids == file.unsimplified_ids { | ||
| return Err(ConflictResolveError::EmptyOrUnchanged); |
Member
Author
There was a problem hiding this comment.
I kind of want to use a more specific error here (that is, definitively unchanged, not "unchanged or empty"). Happy to make that error and use it instead of this if we want.
yuja
reviewed
Aug 16, 2026
| Merge::normal(new_file_id) | ||
| }; | ||
|
|
||
| if new_file_ids == file.unsimplified_ids { |
Contributor
There was a problem hiding this comment.
nit: Can you move this into the if editor.merge_tool_edits_conflict_markers || exit_status_implies_conflict block? It only matters when non-identical materialized content can produce the same output.
| std::fs::write(&editor_script, "")?; | ||
| let output = work_dir.run_jj([ | ||
| "resolve", | ||
| "--config=merge-tools.fake-editor.merge-tool-edits-conflict-markers=true", |
Contributor
There was a problem hiding this comment.
This doesn't seem to test the fixed issue. We need to modify the materialized content.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Previously, we were always updating the tree, even if the files were unchanged by the external editor.
Fixes #9138.
Checklist
If applicable:
CHANGELOG.mdREADME.md,docs/,demos/)cli/src/config-schema.json)how it works, how it's organized), including any code drafted by an LLM.
an eye towards deleting anything that is irrelevant, clarifying anything
that is confusing, and adding details that are relevant. This includes,
for example, commit descriptions, PR descriptions, and code comments.