The patches for 3.2.4pre2.

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

diff --git a/detect-renamed.diff b/detect-renamed.diff
index 8adffd69776bc0723727417595fa7a57304e640f..26ff5844f86f3fa852253f473e75fd54c3d37d66 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: 6b8db0f6440b28d26ef807d17517715c47e62bd9
+based-on: c3b553a93f7090bcbb89c08405f1a5f1c175c864
 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 },
-@@ -2356,7 +2358,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2363,7 +2365,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) {
-@@ -2365,6 +2367,7 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2372,6 +2374,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");
                        return 0;
                }
-@@ -2771,6 +2774,8 @@ void server_options(char **args, int *argc_p)
+@@ -2778,6 +2781,8 @@ void server_options(char **args, int *argc_p)
                        args[ac++] = "--super";
                if (size_only)
                        args[ac++] = "--size-only";
@@ -658,7 +658,7 @@ diff --git a/receiver.c b/receiver.c
 diff --git a/rsync.1.md b/rsync.1.md
 --- a/rsync.1.md
 +++ b/rsync.1.md
-@@ -416,6 +416,7 @@ detailed description below for a complete description.
+@@ -420,6 +420,7 @@ has its own detailed description later in this man page.
  --modify-window=NUM, -@  set the accuracy for mod-time comparisons
  --temp-dir=DIR, -T       create temporary files in directory DIR
  --fuzzy, -y              find similar file for basis if no dest file
@@ -666,9 +666,9 @@ 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
-@@ -2315,6 +2316,22 @@ your home directory (remove the '=' for that).
-     fuzzy-match files, so either use `--delete-after` or specify some filename
-     exclusions if you need to prevent this.
+@@ -2413,6 +2414,22 @@ your home directory (remove the '=' for that).
+     potential fuzzy-match files, so either use [`--delete-after`](#opt) or
+     specify some filename exclusions if you need to prevent this.
  
 +0.  `--detect-renamed`
 +
@@ -682,9 +682,9 @@ diff --git a/rsync.1.md b/rsync.1.md
 +
 +    By default, alternate-basis files are hard-linked into a directory named
 +    ".~tmp~" in each file's destination directory, but if you've specified the
-+    `--partial-dir` option, that directory will be used instead.  These
++    [`--partial-dir`](#opt) option, that directory will be used instead.  These
 +    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.  `--compare-dest=DIR`