You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
When using jj split -i <paths> with an external merge tool, file that are added/change but not included in <paths> get added to the first commit. This is unexpected does not happen with the built-in editor
This patch doesn't fix DiffEditor::edit() API, which is fundamentally broken
if matcher argument is specified. I'm not sure if the builtin behavior is
correct or not. Suppose we add "jj diffedit FILESETS..", it would probably make
sense to leave unmatched paths unmodified because it is the command to edit the
destination (or right) tree. This is the edit_diff_external() behavior.
Fixesjj-vcs#5252
yuja
added a commit
to yuja/jj
that referenced
this issue
Jan 4, 2025
This patch doesn't fix DiffEditor::edit() API, which is fundamentally broken
if matcher argument is specified. I'm not sure if the builtin behavior is
correct or not. Suppose we add "jj diffedit FILESETS..", it would probably make
sense to leave unmatched paths unmodified because it is the command to edit the
destination (or right) tree. This is the edit_diff_external() behavior.
Fixesjj-vcs#5252
Description
When using
jj split -i <paths>
with an external merge tool, file that are added/change but not included in<paths>
get added to the first commit. This is unexpected does not happen with the built-in editorSteps to Reproduce the Problem
Expected Behavior
The newly split commit only contains the modifications for file1.
Actual Behavior
The newly split commit contains the modifications for file1 and file2 as well as the newly added file3.
Specifications
The text was updated successfully, but these errors were encountered: