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/12/21 12:30:11 UTC

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

Author: stsp
Date: Wed Dec 21 12:30:10 2016
New Revision: 1775406

URL: http://svn.apache.org/viewvc?rev=1775406&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (find_nested_moves): Pass the correct revision as 'deleted_rev' argument
   to the check_move_ancestry() helper function.

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=1775406&r1=1775405&r2=1775406&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Wed Dec 21 12:30:10 2016
@@ -688,7 +688,7 @@ find_nested_moves(apr_array_header_t *mo
       copy = APR_ARRAY_IDX(copies_with_same_source_path, 0, struct copy_info *);
       SVN_ERR(check_move_ancestry(&related, ra_session, repos_root_url,
                                   moved_along_repos_relpath,
-                                  rev_below(revision),
+                                  revision,
                                   copy->copyfrom_path,
                                   copy->copyfrom_rev,
                                   TRUE, iterpool));