svn commit: r1242401 - /subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c

[st...@apache.org]

Author: stsp
Date: Thu Feb  9 17:02:39 2012
New Revision: 1242401

URL: http://svn.apache.org/viewvc?rev=1242401&view=rev
Log:
On the multi-layer-moves branch, rename a local variable for clarity.

* subversion/libsvn_wc/wc_db.c
  (delete_node): child_subtree_relpath is the relative path portion of
   the path the child has been moved-to, rather than the child's pre-move
   local relpath. So rename it to child_moved_to_subtree_relpath.

Modified:
    subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c

Modified: subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c?rev=1242401&r1=1242400&r2=1242401&view=diff
==============================================================================
--- subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/branches/multi-layer-moves/subversion/libsvn_wc/wc_db.c Thu Feb  9 17:02:39 2012
@@ -6414,7 +6414,7 @@ delete_node(void *baton,
             {
               const char *child_moved_to
                 = svn_sqlite__column_text(stmt, 1, NULL);
-              const char *child_subtree_relpath
+              const char *child_moved_to_subtree_relpath
                 = svn_relpath_skip_ancestor(local_relpath, child_moved_to);
               apr_int64_t child_op_depth = svn_sqlite__column_int64(stmt, 2);
 
@@ -6423,10 +6423,11 @@ delete_node(void *baton,
               moved_node->local_relpath
                 = svn_sqlite__column_text(stmt, 0, scratch_pool);
 
-              if (child_subtree_relpath)
+              if (child_moved_to_subtree_relpath)
                 moved_node->moved_to_relpath
                   = svn_relpath_join(b->moved_to_relpath,
-                                     child_subtree_relpath, scratch_pool);
+                                     child_moved_to_subtree_relpath,
+                                     scratch_pool);
               else
                 moved_node->moved_to_relpath
                   = apr_pstrdup(scratch_pool, child_moved_to);