--- old/compat.c
+++ new/compat.c
-@@ -49,6 +49,7 @@ extern int preserve_hard_links;
+@@ -50,6 +50,7 @@ extern int preserve_hard_links;
extern int need_messages_from_generator;
extern int delete_mode, delete_before, delete_during, delete_after;
extern int delete_excluded;
extern int make_backups;
extern char *shell_cmd; /* contains VER.SUB string if client is a pre-release */
extern char *backup_dir, *backup_suffix;
-@@ -209,7 +210,7 @@ void setup_protocol(int f_out,int f_in)
- } else if (protocol_version >= 30) {
+@@ -204,7 +205,7 @@ void setup_protocol(int f_out,int f_in)
if (recurse && allow_inc_recurse && !preserve_hard_links
&& !delete_before && !delete_after && !delay_updates
-- && !prune_empty_dirs && !use_qsort)
-+ && !prune_empty_dirs && !use_qsort && !detect_renamed)
+ && (!relative_paths || implied_dirs) && !use_qsort
+- && !prune_empty_dirs)
++ && !prune_empty_dirs && !detect_renamed)
inc_recurse = 1;
need_messages_from_generator = 1;
}
static void send_directory(int f, struct file_list *flist,
char *fbuf, int len, int flags);
-@@ -1912,6 +1954,25 @@ struct file_list *send_file_list(int f,
+@@ -1929,6 +1971,25 @@ struct file_list *send_file_list(int f,
if (verbose > 2)
rprintf(FINFO, "send_file_list done\n");
static int phase = 0;
static int dflt_perms;
-@@ -1289,8 +1435,12 @@ static void recv_generator(char *fname,
+@@ -1298,8 +1444,12 @@ static void recv_generator(char *fname,
}
}
else if (delete_during && f_out != -1 && !phase && dry_run < 2
goto cleanup;
}
-@@ -1562,8 +1712,14 @@ static void recv_generator(char *fname,
+@@ -1571,8 +1721,14 @@ static void recv_generator(char *fname,
if (preserve_hard_links && F_HLINK_NOT_LAST(file))
goto cleanup;
#endif
rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s",
full_fname(fname));
goto cleanup;
-@@ -1876,6 +2032,12 @@ void generate_files(int f_out, const cha
+@@ -1885,6 +2041,12 @@ void generate_files(int f_out, const cha
if (verbose > 2)
rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
if (delete_before && !solo_file && cur_flist->used > 0)
do_delete_pass();
if (delete_during == 2) {
-@@ -1886,7 +2048,7 @@ void generate_files(int f_out, const cha
+@@ -1895,7 +2057,7 @@ void generate_files(int f_out, const cha
}
do_progress = 0;
whole_file = 0;
if (verbose >= 2) {
rprintf(FINFO, "delta-transmission %s\n",
-@@ -1917,7 +2079,7 @@ void generate_files(int f_out, const cha
+@@ -1926,7 +2088,7 @@ void generate_files(int f_out, const cha
dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
} else
dirdev = MAKEDEV(0, 0);
}
}
}
-@@ -1970,7 +2132,21 @@ void generate_files(int f_out, const cha
+@@ -1979,7 +2141,21 @@ void generate_files(int f_out, const cha
} while ((cur_flist = cur_flist->next) != NULL);
if (delete_during)
rprintf(FINFO, "generate_files phase=%d\n", phase);
--- old/options.c
+++ new/options.c
-@@ -79,6 +79,7 @@ int am_generator = 0;
+@@ -80,6 +80,7 @@ int am_generator = 0;
int am_starting_up = 1;
int relative_paths = -1;
int implied_dirs = 1;
{"fuzzy", 'y', POPT_ARG_NONE, &fuzzy_basis, 0, 0, 0 },
{"compress", 'z', POPT_ARG_NONE, 0, 'z', 0, 0 },
{"no-compress", 0, POPT_ARG_VAL, &do_compression, 0, 0, 0 },
-@@ -1491,7 +1494,7 @@ int parse_arguments(int *argc, const cha
+@@ -1495,7 +1498,7 @@ int parse_arguments(int *argc, const cha
inplace = 1;
}
partial_dir = tmp_partialdir;
if (inplace) {
-@@ -1500,6 +1503,7 @@ int parse_arguments(int *argc, const cha
+@@ -1504,6 +1507,7 @@ int parse_arguments(int *argc, const cha
snprintf(err_buf, sizeof err_buf,
"--%s cannot be used with --%s\n",
append_mode ? "append" : "inplace",
delay_updates ? "delay-updates" : "partial-dir");
return 0;
}
-@@ -1842,6 +1846,8 @@ void server_options(char **args,int *arg
+@@ -1844,6 +1848,8 @@ void server_options(char **args,int *arg
args[ac++] = "--super";
if (size_only)
args[ac++] = "--size-only";
if (asprintf(&arg, "--skip-compress=%s", skip_compress) < 0)
--- old/rsync.yo
+++ new/rsync.yo
-@@ -373,6 +373,7 @@ to the detailed description below for a
+@@ -388,6 +388,7 @@ to the detailed description below for a
--modify-window=NUM compare mod-times with reduced accuracy
-T, --temp-dir=DIR create temporary files in directory DIR
-y, --fuzzy find similar file for basis if no dest file
--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
-@@ -1361,6 +1362,15 @@ Note that the use of the bf(--delete) op
+@@ -1376,6 +1377,15 @@ Note that the use of the bf(--delete) op
fuzzy-match files, so either use bf(--delete-after) or specify some
filename exclusions if you need to prevent this.