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

[julianfoad]

Author: julianfoad
Date: Thu Nov 24 21:50:27 2011
New Revision: 1205990

URL: http://svn.apache.org/viewvc?rev=1205990&view=rev
Log:
* subversion/libsvn_client/merge.c
  (single_file_merge_notify): Rename a parameter. A follow-up to r1163296.

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=1205990&r1=1205989&r2=1205990&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Nov 24 21:50:27 2011
@@ -5282,7 +5282,7 @@ single_file_merge_get_file(const char **
    and set *HEADER_SENT to TRUE. */
 static APR_INLINE void
 single_file_merge_notify(notification_receiver_baton_t *notify_baton,
-                         const char *local_abspath,
+                         const char *target_relpath,
                          svn_wc_notify_action_t action,
                          svn_wc_notify_state_t text_state,
                          svn_wc_notify_state_t prop_state,
@@ -5290,7 +5290,7 @@ single_file_merge_notify(notification_re
                          svn_boolean_t *header_sent,
                          apr_pool_t *pool)
 {
-  svn_wc_notify_t *notify = svn_wc_create_notify(local_abspath, action, pool);
+  svn_wc_notify_t *notify = svn_wc_create_notify(target_relpath, action, pool);
   notify->kind = svn_node_file;
   notify->content_state = text_state;
   notify->prop_state = prop_state;