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/08/15 11:57:57 UTC
svn commit: r1157754 - /subversion/trunk/subversion/include/svn_wc.h
Author: julianfoad
Date: Mon Aug 15 09:57:57 2011
New Revision: 1157754
URL: http://svn.apache.org/viewvc?rev=1157754&view=rev
Log:
Update comments.
* subversion/include/svn_wc.h
(svn_wc_conflict_description2_t): Update the cross-reference to the _dup
function.
(svn_wc_conflict_description_t): Remove the cross-reference to the
non-existent _dup function.
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=1157754&r1=1157753&r2=1157754&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Mon Aug 15 09:57:57 2011
@@ -1755,7 +1755,7 @@ typedef struct svn_wc_conflict_descripti
/** Info on the "merge-right source" or "their" version of incoming change. */
const svn_wc_conflict_version_t *src_right_version;
- /* Remember to adjust svn_wc__conflict_description_dup()
+ /* Remember to adjust svn_wc__conflict_description2_dup()
* if you add new fields to this struct. */
} svn_wc_conflict_description2_t;
@@ -1849,8 +1849,6 @@ typedef struct svn_wc_conflict_descripti
* @since New in 1.6. */
svn_wc_conflict_version_t *src_right_version;
- /* Remember to adjust svn_wc__conflict_description_dup()
- * if you add new fields to this struct. */
} svn_wc_conflict_description_t;
/**