mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-18 18:27:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Mention path in message for ConflictResolveError::NotNormalFilesError.

Browse source
This commit is contained in:
Ilya Grigoriev 2022-12-03 23:10:10 -08:00
parent 48c44344bf
commit b58be8d7a4
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/diff_edit.rs
View file

@ -89,7 +89,7 @@ pub enum ConflictResolveError {
NotAConflictError(RepoPath), NotAConflictError(RepoPath),
#[error( #[error(
"Only conflicts that involve normal files (not symlinks, not executable, etc.) are \ "Only conflicts that involve normal files (not symlinks, not executable, etc.) are \
supported. Conflict summary:\n {1}" supported. Conflict summary for {0:?}:\n{1}"
)] )]
NotNormalFilesError(RepoPath, String), NotNormalFilesError(RepoPath, String),
#[error( #[error(

4
tests/test_resolve_command.rs
View file

@ -409,8 +409,8 @@ fn test_file_vs_dir() {
let error = test_env.jj_cmd_failure(&repo_path, &["resolve", "file"]); let error = test_env.jj_cmd_failure(&repo_path, &["resolve", "file"]);
insta::assert_snapshot!(error, @r###" insta::assert_snapshot!(error, @r###"
Error: Failed to use external tool to resolve: Only conflicts that involve normal files (not symlinks, not executable, etc.) are supported. Conflict summary: Error: Failed to use external tool to resolve: Only conflicts that involve normal files (not symlinks, not executable, etc.) are supported. Conflict summary for "file":
Conflict: Conflict:
Removing file with id df967b96a579e45a18b8251732d16804b2e56a55 Removing file with id df967b96a579e45a18b8251732d16804b2e56a55
Adding file with id 78981922613b2afb6025042ff6bd878ac1994e85 Adding file with id 78981922613b2afb6025042ff6bd878ac1994e85
Adding tree with id 133bb38fc4e4bf6b551f1f04db7e48f04cac2877 Adding tree with id 133bb38fc4e4bf6b551f1f04db7e48f04cac2877