Updated patches to work with the current trunk.

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

diff --git a/detect-renamed-lax.diff b/detect-renamed-lax.diff
index b90b7b5..0332365 100644 (file)
--- a/detect-renamed-lax.diff
+++ b/detect-renamed-lax.diff
@@ -20,8 +20,8 @@ switches to --detect-moved blindly accepts the staged file.
 
 -- Matt McCutchen <hashproduct+rsync@gmail.com>
 
+based-on: patch/detect-renamed
 diff --git a/generator.c b/generator.c
-index 35ba203..ac844ac 100644
 --- a/generator.c
 +++ b/generator.c
 @@ -469,7 +469,9 @@ static int fattr_find(struct file_struct *f, char *fname)
@@ -35,7 +35,7 @@ index 35ba203..ac844ac 100644
                diff = u_strcmp(fmid->basename, f->basename);
                if (diff == 0) {
                        good_match = mid;
-@@ -1796,6 +1798,21 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1784,6 +1786,21 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                fnamecmp = partialptr;
                fnamecmp_type = FNAMECMP_PARTIAL_DIR;
                statret = 0;
@@ -58,10 +58,9 @@ index 35ba203..ac844ac 100644
  
        if (!do_xfers)
 diff --git a/options.c b/options.c
-index 7e454b3..1da38cb 100644
 --- a/options.c
 +++ b/options.c
-@@ -744,6 +744,8 @@ void usage(enum logcode F)
+@@ -745,6 +745,8 @@ void usage(enum logcode F)
    rprintf(F," -T, --temp-dir=DIR          create temporary files in directory DIR\n");
    rprintf(F," -y, --fuzzy                 find similar file for basis if no dest file\n");
    rprintf(F,"     --detect-renamed        try to find renamed files to speed up the transfer\n");
@@ -70,7 +69,7 @@ index 7e454b3..1da38cb 100644
    rprintf(F,"     --compare-dest=DIR      also compare destination files relative to DIR\n");
    rprintf(F,"     --copy-dest=DIR         ... and include copies of unchanged files\n");
    rprintf(F,"     --link-dest=DIR         hardlink to files in DIR when unchanged\n");
-@@ -939,7 +941,9 @@ static struct poptOption long_options[] = {
+@@ -940,7 +942,9 @@ static struct poptOption long_options[] = {
    {"compare-dest",     0,  POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
    {"copy-dest",        0,  POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
    {"link-dest",        0,  POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
@@ -81,7 +80,7 @@ index 7e454b3..1da38cb 100644
    {"fuzzy",           'y', POPT_ARG_VAL,    &fuzzy_basis, 1, 0, 0 },
    {"no-fuzzy",         0,  POPT_ARG_VAL,    &fuzzy_basis, 0, 0, 0 },
    {"no-y",             0,  POPT_ARG_VAL,    &fuzzy_basis, 0, 0, 0 },
-@@ -2480,8 +2484,14 @@ void server_options(char **args, int *argc_p)
+@@ -2517,8 +2521,14 @@ void server_options(char **args, int *argc_p)
                        args[ac++] = "--super";
                if (size_only)
                        args[ac++] = "--size-only";
@@ -99,7 +98,6 @@ index 7e454b3..1da38cb 100644
                        args[ac++] = "--stats";
        } else {
 diff --git a/rsync.yo b/rsync.yo
-index 4df39b0..e254152 100644
 --- a/rsync.yo
 +++ b/rsync.yo
 @@ -398,6 +398,8 @@ to the detailed description below for a complete description.  verb(
@@ -111,7 +109,7 @@ index 4df39b0..e254152 100644
       --compare-dest=DIR      also compare received files relative to DIR
       --copy-dest=DIR         ... and include copies of unchanged files
       --link-dest=DIR         hardlink to files in DIR when unchanged
-@@ -1621,6 +1623,17 @@ the bf(--partial-dir) option, that directory will be used instead.  These
+@@ -1642,6 +1644,17 @@ the bf(--partial-dir) option, that directory will be used instead.  These
  potential alternate-basis files will be removed as the transfer progresses.
  This option conflicts with bf(--inplace) and bf(--append).