subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
Subject svn commit: r1783516 - /subversion/site/publish/docs/release-notes/1.10.html
Date Sat, 18 Feb 2017 11:21:37 GMT
Author: stsp
Date: Sat Feb 18 11:21:36 2017
New Revision: 1783516

* site/publish/docs/release-notes/1.10.html: Mention the 'recommended option'
  feature of the new conflict resolver.


Modified: subversion/site/publish/docs/release-notes/1.10.html
--- subversion/site/publish/docs/release-notes/1.10.html (original)
+++ subversion/site/publish/docs/release-notes/1.10.html Sat Feb 18 11:21:36 2017
@@ -224,6 +224,13 @@ href="
    branches rename files or directories. For best results, all SVN clients
    committing to the repository should be at version 1.8 or higher.</p>
+<p>The new conflict resolver will avoid asking users about resolution options
+   whenever there is a only one reasonable course of action. For example, if
+   a file was moved to another location in the repository, the conflict
+   resolver will attempt to resolve the tree conflict on behalf of the user
+   by performing the same move locally if necessary. This allows users to focus
+   their attention on conflicts which cannot be resolved automatically.</p>
 <p>Because detection of moves and renames involves heuristics, detection
    is not perfect and won't work in all conceivable cases. For a detailed
    description of how incoming moves and renames are detected, see <a

View raw message