-- 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)
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,
+@@ -1800,6 +1802,21 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
fnamecmp = partialptr;
fnamecmp_type = FNAMECMP_PARTIAL_DIR;
statret = 0;
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)
{"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)
+@@ -2497,8 +2501,14 @@ void server_options(char **args, int *argc_p)
args[ac++] = "--super";
if (size_only)
args[ac++] = "--size-only";
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(
--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
+@@ -1640,6 +1642,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).