Author: kotkov
Date: Tue Oct 11 15:35:07 2016
New Revision: 1764270
URL: http://svn.apache.org/viewvc?rev=1764270&view=rev
Log:
Lay some groundwork for fixing the chained incoming moves conflict
resolution by fixing a minor bug in the check_move_ancestry() function.
* subversion/libsvn_client/conflicts.c
(check_move_ancestry): If there is no location for the deleted node
@COPYFROM_REV, the deleted and the copied nodes are not related.
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=1764270&r1=1764269&r2=1764270&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Tue Oct 11 15:35:07
2016
@@ -322,6 +322,8 @@ check_move_ancestry(svn_boolean_t *relat
if (strcmp(deleted_location, copyfrom_path) != 0)
return SVN_NO_ERROR;
}
+ else
+ return SVN_NO_ERROR;
/* Verify that copyfrom_rev >= last-changed revision of the deleted node. */
SVN_ERR(svn_ra_stat(ra_session, "", deleted_rev - 1, &dirent, scratch_pool));
