svn commit: r1132449 - /subversion/trunk/subversion/libsvn_client/merge.c

[rhuijben]

Author: rhuijben
Date: Sun Jun  5 16:30:33 2011
New Revision: 1132449

URL: http://svn.apache.org/viewvc?rev=1132449&view=rev
Log:
Resolve 3 deprecation warnings in the merge code.

* subversion/libsvn_client/merge.c
  (get_mergeinfo_paths,
   do_file_merge,
   calculate_left_hand_side): Use svn_dirent_local_style for error message.

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

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1132449&r1=1132448&r2=1132449&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Sun Jun  5 16:30:33 2011
@@ -5690,7 +5690,7 @@ get_mergeinfo_paths(apr_array_header_t *
                     SVN_ERR_CLIENT_INVALID_MERGEINFO_NO_MERGETRACKING, err,
                     _("Invalid mergeinfo detected on '%s', "
                       "mergetracking not possible"),
-                    svn_path_local_style(wc_path, scratch_pool));
+                    svn_dirent_local_style(wc_path, scratch_pool));
                 }
               return svn_error_return(err);
             }
@@ -6754,7 +6754,7 @@ do_file_merge(svn_mergeinfo_catalog_t re
                 SVN_ERR_CLIENT_INVALID_MERGEINFO_NO_MERGETRACKING, err,
                 _("Invalid mergeinfo detected on merge target '%s', "
                   "mergetracking not possible"),
-                svn_path_local_style(target_abspath, scratch_pool));
+                svn_dirent_local_style(target_abspath, scratch_pool));
             }
           return svn_error_return(err);
         }
@@ -10236,7 +10236,7 @@ calculate_left_hand_side(const char **ur
                 SVN_ERR_CLIENT_INVALID_MERGEINFO_NO_MERGETRACKING, err,
                 _("Invalid mergeinfo detected on '%s', "
                   "reintegrate merge not possible"),
-                svn_path_local_style(absolute_path, scratch_pool));
+                svn_dirent_local_style(absolute_path, scratch_pool));
             }
           return svn_error_return(err);
         }