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 2012/11/07 12:46:58 UTC
svn commit: r1406577 -
/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Author: stsp
Date: Wed Nov 7 11:46:57 2012
New Revision: 1406577
URL: http://svn.apache.org/viewvc?rev=1406577&view=rev
Log:
* subversion/libsvn_wc/wc_db_update_move.c
(tc_editor_alter_file): Rename kind to move_dst_kind for cosmetic reasons.
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c?rev=1406577&r1=1406576&r2=1406577&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Wed Nov 7 11:46:57 2012
@@ -135,17 +135,17 @@ tc_editor_alter_file(void *baton,
const svn_checksum_t *move_dst_checksum;
const char *move_dst_repos_relpath;
svn_revnum_t move_dst_revision;
- svn_kind_t kind;
+ svn_kind_t move_dst_kind;
/* Get kind, revision, and checksum of the moved-here node. */
- SVN_ERR(svn_wc__db_depth_get_info(NULL, &kind, &move_dst_revision,
+ SVN_ERR(svn_wc__db_depth_get_info(NULL, &move_dst_kind, &move_dst_revision,
&move_dst_repos_relpath, NULL, NULL, NULL,
NULL, NULL, &move_dst_checksum, NULL,
NULL, b->wcroot, dst_relpath,
relpath_depth(b->move_root_dst_relpath),
scratch_pool, scratch_pool));
SVN_ERR_ASSERT(move_dst_revision == expected_move_dst_revision);
- SVN_ERR_ASSERT(kind == svn_kind_file);
+ SVN_ERR_ASSERT(move_dst_kind == svn_kind_file);
/* ### what if checksum kind differs?*/
if (!svn_checksum_match(move_src_checksum, move_dst_checksum))