Author: svn-role
Date: Sat Jul 6 04:00:05 2024
New Revision: 1918957
URL: http://svn.apache.org/viewvc?rev=1918957&view=rev
Log:
Merge r1917946 from trunk:
* r1917946
Convert path to local style in error message from diff API
Justification:
Use correct dirent style in error message
Votes:
+1: hartmannathan, astieger, jamessan, rinrab
Modified:
subversion/branches/1.14.x/ (props changed)
subversion/branches/1.14.x/STATUS
subversion/branches/1.14.x/subversion/libsvn_client/diff.c
Propchange: subversion/branches/1.14.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1917946
Modified: subversion/branches/1.14.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1918957&r1=1918956&r2=1918957&view=diff
==============================================================================
--- subversion/branches/1.14.x/STATUS (original)
+++ subversion/branches/1.14.x/STATUS Sat Jul 6 04:00:05 2024
@@ -28,13 +28,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1917946
- Convert path to local style in error message from diff API
- Justification:
- Use correct dirent style in error message
- Votes:
- +1: hartmannathan, astieger, jamessan, rinrab
-
* r1915236, r1915239
Support building swig-rb with clang 16 / GCC14
Justification:
Modified: subversion/branches/1.14.x/subversion/libsvn_client/diff.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/libsvn_client/diff.c?rev=1918957&r1=1918956&r2=1918957&view=diff
==============================================================================
--- subversion/branches/1.14.x/subversion/libsvn_client/diff.c (original)
+++ subversion/branches/1.14.x/subversion/libsvn_client/diff.c Sat Jul 6
04:00:05 2024
@@ -205,7 +205,9 @@ adjust_paths_for_diff_labels(const char
else if (! strcmp(relative_to_dir, new_path))
new_path = ".";
else
- return MAKE_ERR_BAD_RELATIVE_PATH(new_path, relative_to_dir);
+ return MAKE_ERR_BAD_RELATIVE_PATH(
+ svn_dirent_local_style(new_path, scratch_pool),
+ svn_dirent_local_style(relative_to_dir, scratch_pool));
}
{
