svn commit: r1806823 - /subversion/trunk/subversion/libsvn_client/conflicts.c

[st...@apache.org]

Author: stsp
Date: Thu Aug 31 17:06:49 2017
New Revision: 1806823

URL: http://svn.apache.org/viewvc?rev=1806823&view=rev
Log:
Fix a conflict resolver bug where moves reported for moved-along children
were storing the moved parent path instead of the moved-along child's path.

* subversion/libsvn_client/conflicts.c
  (find_revision_for_suspected_deletion): If a node is found to have moved,
   pass the deleted node's path to find_operative_moves() instead of the
   (potentially, parent) path where the move occurred.

Modified:
    subversion/trunk/subversion/libsvn_client/conflicts.c

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1806823&r1=1806822&r2=1806823&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Thu Aug 31 17:06:49 2017
@@ -1925,7 +1925,7 @@ find_revision_for_suspected_deletion(svn
           *deleted_rev_author = move->rev_author;
           *replacing_node_kind = b.replacing_node_kind;
           SVN_ERR(find_operative_moves(moves, moves_table,
-                                       move->moved_from_repos_relpath,
+                                       b.deleted_repos_relpath,
                                        move->rev,
                                        ra_session, repos_root_url,
                                        result_pool, scratch_pool));