X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/28c54e81c16a0c557bac03146b2ff83bb12d9580..158595849728f923445b7f3920e9d2776ac116f8:/NEWS

diff --git a/NEWS b/NEWS
index 62e9c63c..76fabc40 100644
--- a/NEWS
+++ b/NEWS
@@ -148,8 +148,9 @@ Changes since 2.6.3:
       filter files (like .cvsignore, but with full filter-rule parsing).
       This new option was chosen in order to ensure that all existing
       include/exclude processing remained 100% compatible with older
-      versions.  (Protocol 29 needed for full filter-rule support, but
-      backward-compatible rules work with earlier protocol versions.)
+      versions.  Protocol 29 is needed for full filter-rule support, but
+      backward-compatible rules work with earlier protocol versions.
+      (Promoted from the patches dir.)
 
     - Added the --delay-updates option that puts all updated files into
       a temporary directory (by default ".~tmp~", but settable via the
@@ -166,6 +167,15 @@ Changes since 2.6.3:
       they are given, and refuse to operate on a directory index (since
       that would indicate that something had gone very wrong).
 
+    - Added the --fuzzy option, which attempts to find a basis file for a
+      file that is being created from scratch.  The current algorithm
+      only looks in the destination directory for the created file, but
+      it does attempt to find a match based on size/mod-time (in case the
+      file was renamed with no other changes) as well as based on a fuzzy
+      name-matching algorithm.  This option requires protocol 29 because
+      it needs the new file-sorting order.  (Promoted from patches dir
+      and enhanced.)
+
   SUPPORT FILES:
 
     - Added support/atomic-rsync -- a perl script that will transfer some
@@ -220,10 +230,11 @@ Changes since 2.6.3:
       filter rules so it is positioned correctly (unlike in some older
       transfer scenarios).
 
-    - Rsync sorts the filename list in a slightly different way for some
-      rare sets of files:  it always puts a dir's contents immediately
-      after the dir in the list.  (Previously an item named "foo.txt" would
-      sort in between directory "foo" and "foo/bar".)
+    - Rsync sorts the filename list in a different way:  it sorts the
+      subdir names after the non-subdir names for each dir's contents, and
+      it always puts a dir's contents immediately after the dir's name in
+      the list.  (Previously an item named "foo.txt" would sort in between
+      directory "foo/" and "foo/bar".)
 
     - When talking to a protocol 29 rsync daemon, a list-only request
       is able to note this before the options are sent over the wire, and