[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-commits
Subject:    svn commit: r1771910 - /subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
From:       stsp () apache ! org
Date:       2016-11-29 14:27:10
Message-ID: 20161129142711.8EEC53A0EB1 () svn01-us-west ! apache ! org
[Download RAW message or body]

Author: stsp
Date: Tue Nov 29 14:27:10 2016
New Revision: 1771910

URL: http://svn.apache.org/viewvc?rev=1771910&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (tc_editor_update_incoming_moved_file): Rename local variable to better name.

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=1771910&r1=1771909&r2=1771910&view=diff
 ==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Tue Nov 29 14:27:10 \
2016 @@ -1443,7 +1443,7 @@ tc_editor_update_incoming_moved_file(nod
   svn_skel_t *work_item, *work_items = NULL;
   svn_node_kind_t dst_kind_on_disk;
   const char *dst_repos_relpath;
-  svn_boolean_t obstructed = FALSE;
+  svn_boolean_t tree_conflict = FALSE;
   svn_node_kind_t dst_db_kind;
   svn_error_t *err;
 
@@ -1482,7 +1482,7 @@ tc_editor_update_incoming_moved_file(nod
                                            svn_relpath_basename(dst_relpath,
                                                                 scratch_pool),
                                            scratch_pool);
-      obstructed = TRUE;
+      tree_conflict = TRUE;
     }
   else
     SVN_ERR(err);
@@ -1498,7 +1498,7 @@ tc_editor_update_incoming_moved_file(nod
                                         svn_wc_conflict_action_edit,
                                         NULL,
                                         scratch_pool, scratch_pool));
-      obstructed = TRUE;
+      tree_conflict = TRUE;
     }
 
   SVN_ERR(svn_io_check_path(dst_abspath, &dst_kind_on_disk, scratch_pool));
@@ -1513,7 +1513,7 @@ tc_editor_update_incoming_moved_file(nod
                                         svn_wc_conflict_action_edit,
                                         NULL,
                                         scratch_pool, scratch_pool));
-      obstructed = TRUE;
+      tree_conflict = TRUE;
     }
 
   old_version.location_and_kind = b->old_version;
@@ -1591,7 +1591,7 @@ tc_editor_update_incoming_moved_file(nod
       SVN_ERR(create_conflict_markers(&work_item, dst_abspath, b->db,
                                       dst_repos_relpath, conflict_skel,
                                       b->operation, &old_version, &new_version,
-                                      svn_node_file, !obstructed,
+                                      svn_node_file, !tree_conflict,
                                       scratch_pool, scratch_pool));
 
       work_items = svn_wc__wq_merge(work_items, work_item, scratch_pool);


[prev in list] [next in list] [prev in thread] [next in thread]