Author: kotkov Date: Wed Dec 7 10:58:26 2022 New Revision: 1905839 URL: http://svn.apache.org/viewvc?rev=1905839&view=rev Log: On the 'pristines-on-demand-on-mwf' branch: Sync with trunk@1905838.
Modified: subversion/branches/pristines-on-demand-on-mwf/ (props changed) subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/adm_files.c Propchange: subversion/branches/pristines-on-demand-on-mwf/ ------------------------------------------------------------------------------ Merged /subversion/trunk:r1905811-1905838 Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/adm_files.c URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/adm_files.c?rev=1905839&r1=1905838&r2=1905839&view=diff ============================================================================== --- subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/adm_files.c (original) +++ subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/adm_files.c Wed Dec 7 10:58:26 2022 @@ -310,7 +310,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)); } SVN_ERR(svn_wc__db_get_settings(NULL, &wc_store_pristine, db, @@ -349,7 +350,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) { @@ -395,7 +398,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)); } }