The patches for 3.2.4pre2.

[rsync-patches.git] / detect-renamed-lax.diff

diff --git a/detect-renamed-lax.diff b/detect-renamed-lax.diff
index 93d3702e4c210243aee40aede4abf568a38ce264..769de96764e0918daea675144a3dedfc9dab66b1 100644 (file)
--- a/detect-renamed-lax.diff
+++ b/detect-renamed-lax.diff
@@ -71,7 +71,7 @@ diff --git a/options.c b/options.c
    {"fuzzy",           'y', POPT_ARG_NONE,   0, 'y', 0, 0 },
    {"no-fuzzy",         0,  POPT_ARG_VAL,    &fuzzy_basis, 0, 0, 0 },
    {"no-y",             0,  POPT_ARG_VAL,    &fuzzy_basis, 0, 0, 0 },
-@@ -2774,8 +2776,14 @@ void server_options(char **args, int *argc_p)
+@@ -2781,8 +2783,14 @@ void server_options(char **args, int *argc_p)
                        args[ac++] = "--super";
                if (size_only)
                        args[ac++] = "--size-only";
@@ -91,7 +91,7 @@ diff --git a/options.c b/options.c
 diff --git a/rsync.1.md b/rsync.1.md
 --- a/rsync.1.md
 +++ b/rsync.1.md
-@@ -417,6 +417,8 @@ detailed description below for a complete description.
+@@ -421,6 +421,8 @@ has its own detailed description later in this man page.
  --temp-dir=DIR, -T       create temporary files in directory DIR
  --fuzzy, -y              find similar file for basis if no dest file
  --detect-renamed         try to find renamed files to speed the xfer
@@ -100,20 +100,23 @@ diff --git a/rsync.1.md b/rsync.1.md
  --compare-dest=DIR       also compare destination files relative to DIR
  --copy-dest=DIR          ... and include copies of unchanged files
  --link-dest=DIR          hardlink to files in DIR when unchanged
-@@ -2332,6 +2334,17 @@ your home directory (remove the '=' for that).
+@@ -2430,6 +2432,20 @@ your home directory (remove the '=' for that).
      otential alternate-basis files will be removed as the transfer progresses.
-     This option conflicts with `--inplace` and `--append`.
+     This option conflicts with [`--inplace`](#opt) and [`--append`](#opt).
  
-+0.  ``--detect-renamed-lax` This version of `--detect-renamed` makes rsync
-+    hard-link `dest/D` to `dest/S` without verifying that `src/S` and
-+    `dest/S` have the same data.  This poses a significant risk of corrupting
-+    the destination by representing a new source file by an unrelated
-+    destination file that coincidentally passes the quick check with the source
-+    file.  Use this option only if you accept the risk and disk I/O is a
-+    bottleneck.
++0.  `--detect-renamed-lax`
 +
-+0.  ``--detect-moved`` A less risky variant of `--detect-renamed-lax` that only
-+    uses a destination file that has the same basename as the new source file.
++    This version of [`--detect-renamed`](#opt) makes rsync hard-link `dest/D`
++    to `dest/S` without verifying that `src/S` and `dest/S` have the same data.
++    This poses a significant risk of corrupting the destination by representing
++    a new source file by an unrelated destination file that coincidentally
++    passes the quick check with the source file.  Use this option only if you
++    accept the risk and disk I/O is a bottleneck.
++
++0.  `--detect-moved`
++
++    A less risky variant of [`--detect-renamed-lax`](#opt) that only uses a
++    destination file that has the same basename as the new source file.
 +
  0.  `--compare-dest=DIR`