mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-10-24 15:43:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

tree: remove check for conflict-simplification resulting in deletion

Browse source 
Since we switched to the new `conflicts::Conflict` type, we represent
a missing tree entry by a `None` value in the conflict, not a missing
"add", so the condition removed in this commit will never happen, and
the case will be handled by the case just below it instead.
This commit is contained in:
Martin von Zweigbergk 2023-06-12 05:37:39 -07:00 committed by Martin von Zweigbergk
parent 19fd8a917a
commit ee98d1eee8
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/src/tree.rs
View file

@ -629,10 +629,6 @@ fn merge_tree_value(
);
let filename = dir.join(basename);
let conflict = simplify_conflict(store, &filename, conflict)?;
if conflict.adds().is_empty() {
// If there are no values to add, then the path doesn't exist
return Ok(None);
}
if conflict.removes().is_empty() && conflict.adds().len() == 1 {
// A single add means that the current state is that state.
return Ok(conflict.adds()[0].clone());