You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2010/05/01 15:57:20 UTC
svn commit: r940019 - /subversion/trunk/subversion/include/svn_wc.h
Author: dannas
Date: Sat May 1 13:57:20 2010
New Revision: 940019
URL: http://svn.apache.org/viewvc?rev=940019&view=rev
Log:
Use local_abspath instead of path in doc comment to match the name in the
declaration.
* subversion/include/svn_wc.h
(svn_wc_conflicted_p3): See above.
Modified:
subversion/trunk/subversion/include/svn_wc.h
Modified: subversion/trunk/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=940019&r1=940018&r2=940019&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Sat May 1 13:57:20 2010
@@ -3105,14 +3105,15 @@ svn_wc_entry_dup(const svn_wc_entry_t *e
* *prop_conflicted_p, and @a *tree_conflicted_p. If one or two of the
* answers are uninteresting, simply pass @c NULL pointers for those.
*
- * If @a path is unversioned or does not exist, return
+ * If @a local_abspath is unversioned or does not exist, return
* #SVN_ERR_WC_PATH_NOT_FOUND.
*
* @a adm_access is the admin access baton of the parent directory.
*
- * If the @a path has corresponding text conflict files (with suffix .mine,
- * .theirs, etc.) that cannot be found, assume that the text conflict has
- * been resolved by the user and return @c FALSE in @a *text_conflicted_p.
+ * If the @a local_abspath has corresponding text conflict files (with suffix
+ * .mine, .theirs, etc.) that cannot be found, assume that the text conflict
+ * has been resolved by the user and return @c FALSE in @a
+ * *text_conflicted_p.
*
* Similarly, if a property conflicts file (.prej suffix) is said to exist,
* but it cannot be found, assume that the property conflicts have been