subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1770634 - /subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Date Mon, 21 Nov 2016 09:42:03 GMT
Author: stsp
Date: Mon Nov 21 09:42:03 2016
New Revision: 1770634

URL: http://svn.apache.org/viewvc?rev=1770634&view=rev
Log:
Introduce a local variable to make code easier to read.

* subversion/libsvn_wc/wc_db_update_move.c
  (update_incoming_moved_node): Alias 'src_relpath' to 'victim_relpath' where
   doing so makes sense.

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=1770634&r1=1770633&r2=1770634&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Mon Nov 21 09:42:03 2016
@@ -2046,6 +2046,7 @@ update_incoming_moved_node(node_move_bat
 {
   update_move_baton_t *b = nmb->umb;
   svn_node_kind_t src_kind, dst_kind;
+  const char *victim_relpath = src_relpath;
   const svn_checksum_t *src_checksum, *dst_checksum;
   apr_hash_t *src_props, *dst_props;
   apr_array_header_t *src_children, *dst_children;
@@ -2056,10 +2057,10 @@ update_incoming_moved_node(node_move_bat
   /* Compare the tree conflict victim's copied layer (the "source") with
    * the working layer, i.e. look for changes layered on top of the copy. */
   SVN_ERR(get_info(&src_props, &src_checksum, &src_children, &src_kind,
-                   src_relpath, b->src_op_depth, wcroot, scratch_pool,
+                   victim_relpath, b->src_op_depth, wcroot, scratch_pool,
                    scratch_pool));
   SVN_ERR(get_working_info(&dst_props, &dst_checksum,
-                           &dst_children, &dst_kind, src_relpath,
+                           &dst_children, &dst_kind, victim_relpath,
                            wcroot, scratch_pool, scratch_pool));
 
   if (src_kind == svn_node_none
@@ -2099,13 +2100,13 @@ update_incoming_moved_node(node_move_bat
           SVN_ERR(svn_wc__internal_file_modified_p(&is_modified, b->db,
                                                    svn_dirent_join(
                                                      b->wcroot->abspath,
-                                                     src_relpath,
+                                                     victim_relpath,
                                                      scratch_pool),
                                                    FALSE /* exact_comparison */,
                                                    scratch_pool));
           if (!props_equal || is_modified)
             SVN_ERR(tc_editor_merge_local_file_change(nmb, dst_relpath,
-                                                      src_relpath,
+                                                      victim_relpath,
                                                       src_checksum,
                                                       dst_checksum,
                                                       dst_props, src_props,



Mime
View raw message