You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/01/07 16:54:22 UTC
svn commit: r1429861 - /subversion/trunk/subversion/libsvn_wc/update_editor.c
Author: stsp
Date: Mon Jan 7 15:54:22 2013
New Revision: 1429861
URL: http://svn.apache.org/viewvc?rev=1429861&view=rev
Log:
* subversion/libsvn_wc/update_editor.c
(complete_conflict): Rename parameter 'kind' to 'local_kind' and document
its intended purpose in the docstring.
Modified:
subversion/trunk/subversion/libsvn_wc/update_editor.c
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1429861&r1=1429860&r2=1429861&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Mon Jan 7 15:54:22 2013
@@ -841,6 +841,9 @@ make_file_baton(struct file_baton **f_p,
/* Complete a conflict skel by describing the update.
*
+ * LOCAL_KIND is the node kind of the tree conflict victim in the
+ * working copy.
+ *
* All temporary allocations are be made in SCRATCH_POOL, while allocations
* needed for the returned conflict struct are made in RESULT_POOL.
*/
@@ -850,7 +853,7 @@ complete_conflict(svn_skel_t *conflict,
const char *local_abspath,
const char *old_repos_relpath,
svn_revnum_t old_revision,
- svn_node_kind_t kind,
+ svn_node_kind_t local_kind,
apr_pool_t *result_pool, apr_pool_t *scratch_pool)
{
const struct edit_baton *eb = pb->edit_baton;
@@ -870,7 +873,7 @@ complete_conflict(svn_skel_t *conflict,
eb->repos_uuid,
old_repos_relpath,
old_revision,
- kind,
+ local_kind,
result_pool);
else
src_left_version = NULL;