Author: kotkov Date: Wed Dec 7 10:53:40 2022 New Revision: 1905838 URL: http://svn.apache.org/viewvc?rev=1905838&view=rev Log: In the svn_wc__internal_ensure_adm() function, do not forget to convert internal paths to local style when constructing error messages.
* subversion/libsvn_wc/adm_files.c (svn_wc__internal_ensure_adm): Add missing calls to svn_dirent_local_style(). Modified: subversion/trunk/subversion/libsvn_wc/adm_files.c Modified: subversion/trunk/subversion/libsvn_wc/adm_files.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_files.c?rev=1905838&r1=1905837&r2=1905838&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/adm_files.c (original) +++ subversion/trunk/subversion/libsvn_wc/adm_files.c Wed Dec 7 10:53:40 2022 @@ -435,7 +435,8 @@ svn_wc__internal_ensure_adm(svn_wc__db_t return svn_error_createf( SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL, _("Format %d doesn't match existing format %d in '%s'"), - target_format, present_format, local_abspath); + target_format, present_format, + svn_dirent_local_style(local_abspath, scratch_pool)); /* ### Should we match copyfrom_revision? */ if (db_revision != revision) @@ -443,7 +444,9 @@ svn_wc__internal_ensure_adm(svn_wc__db_t svn_error_createf(SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL, _("Revision %ld doesn't match existing " "revision %ld in '%s'"), - revision, db_revision, local_abspath); + revision, db_revision, + svn_dirent_local_style(local_abspath, + scratch_pool)); if (!db_repos_root_url) { @@ -489,7 +492,8 @@ svn_wc__internal_ensure_adm(svn_wc__db_t db_repos_relpath, scratch_pool), repos_uuid, - local_abspath); + svn_dirent_local_style(local_abspath, + scratch_pool)); } }