Author: stsp Revision: 1206136 Modified property: svn:log Modified: svn:log at Fri Nov 25 12:55:24 2011 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Fri Nov 25 12:55:24 2011 @@ -1,5 +1,5 @@ On the moves-scan-log branch, allow the heuristic to consider multiple move -destinations for same deleted node. The user will have to resolve ambiguity. +destinations for one deleted node. The user will have to resolve ambiguity. For example, in situations such as: r4: @@ -11,7 +11,7 @@ the user can tell svn to interpret one o as a move and treat the remaining copies as normal copies. Note that the conflict callback implementation already supports this scenario. -But until now the library never returned more than on move suggestion. +But until now the library never returned more than one move suggestion. * subversion/libsvn_wc/update_editor.c (find_applicable_moves): Don't stop processing moves from a single revision
