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

[st...@apache.org]

Author: stsp
Date: Mon Dec  5 14:14:38 2016
New Revision: 1772671

URL: http://svn.apache.org/viewvc?rev=1772671&view=rev
Log:
* subversion/libsvn_client/conflicts.c
  (find_nested_move): Improve an inaccurate comment.

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=1772671&r1=1772670&r2=1772671&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Mon Dec  5 14:14:38 2016
@@ -675,9 +675,9 @@ find_nested_move(struct repos_move_info
       /* Consider: svn mv A B; svn mv B/foo C/foo
        * Copyfrom for C/foo is A/foo, even though C/foo was moved here from
        * B/foo. A/foo was not deleted. It is B/foo which was deleted.
-       * We now know the move A->B and child_repath "foo". Try to detect an
-       * ancestral relationship between A/foo and the known related path.
-       */
+       * We now know about the move A->B and moved-along child_relpath "foo".
+       * Try to detect an ancestral relationship between A/foo and the
+       * moved-along path. */
       moved_along_repos_relpath =
         svn_relpath_join(move->moved_from_repos_relpath, child_relpath,
                          iterpool);