Author: stsp
Date: Thu Jul 27 10:35:31 2017
New Revision: 1803160
URL: http://svn.apache.org/viewvc?rev=1803160&view=rev
Log:
* notes/resolve-moves: A small Wording tweak for clarity in the section
on finding a particular move.
Suggested-by: julianfoad
Modified:
subversion/trunk/notes/resolve-moves
Modified: subversion/trunk/notes/resolve-moves
URL:
http://svn.apache.org/viewvc/subversion/trunk/notes/resolve-moves?rev=1803160&r1=1803159&r2=1803160&view=diff
==============================================================================
--- subversion/trunk/notes/resolve-moves (original)
+++ subversion/trunk/notes/resolve-moves Thu Jul 27 10:35:31 2017
@@ -144,8 +144,9 @@ The repos-path@rev is for the conflict v
appeared in the working copy at the time the conflict was flagged.
To determine whether path@old-rev was moved to another path-moved@new-rev,
-SVN must find path-moved@new-rev, and it must find a chain of moves which
-starts at path@old-rev and ends at path-moved@new-rev.
+SVN must look for a chain of moves which starts at path@old-rev and ends at
+new-rev. If a single such chain is found, then the final path-moved@new-rev
+is known.
To do this, SVN scans all revisions between old-rev and new-rev and
detects any moves within them. Moves of the same node are linked together
