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 2011/07/14 17:43:47 UTC
svn commit: r1146765 - /subversion/trunk/subversion/libsvn_client/mergeinfo.h
Author: julianfoad
Date: Thu Jul 14 15:43:47 2011
New Revision: 1146765
URL: http://svn.apache.org/viewvc?rev=1146765&view=rev
Log:
* subversion/libsvn_client/mergeinfo.h
(svn_client__merge_path_t): Fix a typo.
(svn_client__record_wc_mergeinfo): Fix a doc string error.
Modified:
subversion/trunk/subversion/libsvn_client/mergeinfo.h
Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.h?rev=1146765&r1=1146764&r2=1146765&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.h (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.h Thu Jul 14 15:43:47 2011
@@ -49,7 +49,7 @@ typedef struct svn_client__merge_path_t
probably due to authz
restrictions. */
- svn_boolean_t child_of_noninheritable; /* ABSPATH has no explict mergeinfo
+ svn_boolean_t child_of_noninheritable; /* ABSPATH has no explicit mergeinfo
itself but is the child of a
path with noniheritable
mergeinfo. */
@@ -316,7 +316,7 @@ svn_client__parse_mergeinfo(svn_mergeinf
/* Write MERGEINFO into the WC for LOCAL_ABSPATH. If MERGEINFO is NULL,
remove any SVN_PROP_MERGEINFO for LOCAL_ABSPATH. If MERGEINFO is empty,
record an empty property value (e.g. ""). If CTX->NOTIFY_FUNC2 is
- not null call it with notification type svn_wc_notify_update_update
+ not null call it with notification type svn_wc_notify_merge_record_info
if DO_NOTIFICATION is true.
Use WC_CTX to access the working copy, and SCRATCH_POOL for any temporary