You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by ju...@apache.org on 2012/05/10 18:13:37 UTC

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

Author: julianfoad
Date: Thu May 10 16:13:37 2012
New Revision: 1336773

URL: http://svn.apache.org/viewvc?rev=1336773&view=rev
Log:
* subversion/libsvn_client/merge.c
  (merge_dir_props_changed): Add 'const' on a variable to avoid a warning.

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=1336773&r1=1336772&r2=1336773&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu May 10 16:13:37 2012
@@ -1327,7 +1327,7 @@ merge_dir_props_changed(svn_wc_notify_st
                         apr_pool_t *scratch_pool)
 {
   merge_cmd_baton_t *merge_b = diff_baton;
-  apr_array_header_t *props;
+  const apr_array_header_t *props;
   const char *local_abspath = svn_dirent_join(merge_b->target->abspath,
                                               local_relpath, scratch_pool);
   svn_wc_notify_state_t obstr_state;