ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

working_copy: propagate errors when reading conflicted file

Browse source
This commit is contained in:
Martin von Zweigbergk 2023-08-11 22:02:20 -07:00 committed by Martin von Zweigbergk
parent 33a93b6d2d
commit 23f54b8151
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/src/working_copy.rs
View file

@ -973,7 +973,11 @@ impl TreeState {
err,
})?;
let mut content = vec![];
file.read_to_end(&mut content).unwrap();
file.read_to_end(&mut content)
.map_err(|err| SnapshotError::IoError {
message: format!("Failed to read file {}", disk_path.display()),
err,
})?;
let new_file_ids = conflicts::update_from_content(
&old_file_ids,
self.store.as_ref(),