Author: hartmannathan
Date: Fri May 24 17:08:09 2024
New Revision: 1917946

URL: http://svn.apache.org/viewvc?rev=1917946&view=rev
Log:
Convert path to local style when rising BAD_RELATIVE_PATH error from diff.

* subversion\libsvn_client\diff.c
  (adjust_paths_for_diff_labels): Invoke svn_dirent_local_style() function
   when making BAD_RELATIVE_PATH error to create the error with correct paths.

See mail to dev@ on 23 May 2024: "[PATCH] Convert path to local style when
rising BAD_RELATIVE_PATH error from diff." archived here and elsewhere:
https://lists.apache.org/thread/7lpy07k2b4dfmjfdo915jpt88bd12y2z

Patch by: Timofey Zhakov (tima {at} chemodax _dot_ net)

Modified:
    subversion/trunk/subversion/libsvn_client/diff.c

Modified: subversion/trunk/subversion/libsvn_client/diff.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/diff.c?rev=1917946&r1=1917945&r2=1917946&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/diff.c Fri May 24 17:08:09 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));
     }
 
   {


Reply via email to