mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-12-26 14:00:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

tree: remove useless "Backend error" message from TreeMergeError

Browse source 
I don't think it adds any contextual information. TreeMergeError is somewhat
similar to BackendError.
This commit is contained in:
Yuya Nishihara 2024-03-29 19:48:13 +09:00
parent 6d6841ea9f
commit 1e83faf4f8
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cli/tests/test_abandon_command.rs
View file

@ -317,9 +317,7 @@ fn test_bug_2600_rootcommit_special_case() {
let stderr = test_env.jj_cmd_internal_error(&repo_path, &["abandon", "base"]);
insta::assert_snapshot!(stderr, @r###"
Internal error: Merge failed
Caused by:
1: Backend error
2: The Git backend does not support creating merge commits with the root commit as one of the parents.
Caused by: The Git backend does not support creating merge commits with the root commit as one of the parents.
"###);
}

2
lib/src/tree.rs
View file

@ -41,7 +41,7 @@ pub enum TreeMergeError {
source: std::io::Error,
file_id: FileId,
},
#[error("Backend error")]
#[error(transparent)]
BackendError(#[from] BackendError),
}