The patches for 3.3.0.

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

diff --git a/detect-renamed.diff b/detect-renamed.diff
index 1329ab93ede74d1dfc027f96726bb8b966515c8f..af22b1d3d063963a921593f24965db7a2ebde9a1 100644 (file)
--- a/detect-renamed.diff
+++ b/detect-renamed.diff
@@ -38,7 +38,7 @@ TODO:
   a file that can't use it, while missing out on giving it to a file
   that could use it.
 
-based-on: 9a06b2edb0ea1a226bcc642682c07bacd2ea47d3
+based-on: 6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
 diff --git a/backup.c b/backup.c
 --- a/backup.c
 +++ b/backup.c
@@ -617,7 +617,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 },
-@@ -2398,7 +2400,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2400,7 +2402,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                inplace = 1;
        }
  
@@ -626,7 +626,7 @@ diff --git a/options.c b/options.c
                partial_dir = tmp_partialdir;
  
        if (inplace) {
-@@ -2407,6 +2409,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2409,6 +2411,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                        snprintf(err_buf, sizeof err_buf,
                                 "--%s cannot be used with --%s\n",
                                 append_mode ? "append" : "inplace",
@@ -634,7 +634,7 @@ diff --git a/options.c b/options.c
                                 delay_updates ? "delay-updates" : "partial-dir");
                        goto cleanup;
                }
-@@ -2833,6 +2836,8 @@ void server_options(char **args, int *argc_p)
+@@ -2835,6 +2838,8 @@ void server_options(char **args, int *argc_p)
                        args[ac++] = "--super";
                if (size_only)
                        args[ac++] = "--size-only";
@@ -666,7 +666,7 @@ 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
-@@ -2634,6 +2635,22 @@ expand it.
+@@ -2635,6 +2636,22 @@ expand it.
      potential fuzzy-match files, so either use [`--delete-after`](#opt) or
      specify some filename exclusions if you need to prevent this.