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 2016/11/19 12:18:47 UTC
svn commit: r1770492 -
/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
Author: stsp
Date: Sat Nov 19 12:18:47 2016
New Revision: 1770492
URL: http://svn.apache.org/viewvc?rev=1770492&view=rev
Log:
* subversion/libsvn_wc/wc_db_update_move.c
(update_incoming_moved_node): Set up the driver such that the copied layer
(which is the tree conflict victim) is compared to the working layer at
the same path (i.e. to the local changes inside the tree conflict victim).
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=1770492&r1=1770491&r2=1770492&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Sat Nov 19 12:18:47 2016
@@ -2053,13 +2053,14 @@ update_incoming_moved_node(node_move_bat
if (b->cancel_func)
SVN_ERR(b->cancel_func(b->cancel_baton));
- SVN_ERR(get_working_info(&src_props, &src_checksum, &src_children,
- &src_kind, src_relpath, wcroot, scratch_pool,
- scratch_pool));
-
- SVN_ERR(get_info(&dst_props, &dst_checksum, &dst_children, &dst_kind,
- dst_relpath, b->dst_op_depth,
- wcroot, scratch_pool, scratch_pool));
+ /* 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,
+ scratch_pool));
+ SVN_ERR(get_working_info(&dst_props, &dst_checksum,
+ &dst_children, &dst_kind, dst_relpath,
+ wcroot, scratch_pool, scratch_pool));
if (src_kind == svn_node_none
|| (dst_kind != svn_node_none && src_kind != dst_kind))