subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1446752 - /subversion/trunk/subversion/libsvn_client/merge.c
Date Fri, 15 Feb 2013 20:09:27 GMT
Author: julianfoad
Date: Fri Feb 15 20:09:27 2013
New Revision: 1446752

URL: http://svn.apache.org/r1446752
Log:
* subversion/libsvn_client/merge.c
  (record_update_add, record_update_update, record_update_delete): Update
    doc strings.

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=1446752&r1=1446751&r2=1446752&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Fri Feb 15 20:09:27 2013
@@ -1404,11 +1404,8 @@ record_tree_conflict(merge_cmd_baton_t *
   return SVN_NO_ERROR;
 }
 
-/* Record the add for future processing and (later) produce the
+/* Record the add for future processing and produce the
    update_add notification
-
-   Originally a helper for notification_receiver: Cache the roots of
-   subtrees added under TARGET_ABSPATH.
  */
 static svn_error_t *
 record_update_add(merge_cmd_baton_t *merge_b,
@@ -1442,8 +1439,8 @@ record_update_add(merge_cmd_baton_t *mer
   return SVN_NO_ERROR;
 }
 
-/* Record the update for future processing and (later) produce the
-   update_add notification */
+/* Record the update for future processing and produce the
+   update_update notification */
 static svn_error_t *
 record_update_update(merge_cmd_baton_t *merge_b,
                      const char *local_abspath,
@@ -1476,7 +1473,7 @@ record_update_update(merge_cmd_baton_t *
   return SVN_NO_ERROR;
 }
 
-/* Record the delete for future processing and (later) produce the
+/* Record the delete for future processing and for (later) producing the
    update_delete notification */
 static svn_error_t *
 record_update_delete(merge_cmd_baton_t *merge_b,



Mime
View raw message