-- Matt McCutchen <hashproduct@gmail.com>
-based-on: 194cee671d5e178f20c4494f41911fa8db942935
+based-on: 9a06b2edb0ea1a226bcc642682c07bacd2ea47d3
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -36,6 +36,7 @@ extern filter_rule_list filter_list;
+@@ -34,6 +34,7 @@ extern filter_rule_list filter_list;
extern filter_rule_list daemon_filter_list;
int make_backups = 0;
/**
* If 1, send the whole file as literal data rather than trying to
-@@ -966,6 +967,7 @@ static struct poptOption long_options[] = {
+@@ -777,6 +778,7 @@ static struct poptOption long_options[] = {
{"bwlimit", 0, POPT_ARG_STRING, &bwlimit_arg, OPT_BWLIMIT, 0, 0 },
{"no-bwlimit", 0, POPT_ARG_VAL, &bwlimit, 0, 0, 0 },
{"backup", 'b', POPT_ARG_VAL, &make_backups, 1, 0, 0 },
{"no-backup", 0, POPT_ARG_VAL, &make_backups, 0, 0, 0 },
{"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
{"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
-@@ -2763,6 +2765,8 @@ void server_options(char **args, int *argc_p)
- goto oom;
- args[ac++] = arg;
- }
+@@ -2838,6 +2840,8 @@ void server_options(char **args, int *argc_p)
+ } else {
+ if (skip_compress)
+ args[ac++] = safe_arg("--skip-compress", skip_compress);
+ if (make_source_backups)
+ args[ac++] = "--source-backup";
}
- if (max_alloc_arg && max_alloc != DEFAULT_MAX_ALLOC) {
+ if (max_alloc_arg && max_alloc != DEFAULT_MAX_ALLOC)
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
-@@ -389,6 +389,7 @@ detailed description below for a complete description.
+@@ -477,6 +477,7 @@ has its own detailed description later in this manpage.
--existing skip creating new files on receiver
--ignore-existing skip updating files that exist on receiver
--remove-source-files sender removes synchronized files (non-dir)
--del an alias for --delete-during
--delete delete extraneous files from dest dirs
--delete-before receiver deletes before xfer, not during
-@@ -1577,6 +1578,16 @@ your home directory (remove the '=' for that).
- Starting with 3.1.0, rsync will skip the sender-side removal (and output an
- error) if the file's size or modify time has not stayed unchanged.
+@@ -1893,6 +1894,17 @@ expand it.
+ not remove a file the receiver just verified, such as when the user
+ accidentally makes the source and destination directory the same path.
+0. `--source-backup`
+
+ Makes the sender back up the source files it removes due to
-+ `--remove-source-files`. This option is independent of `--backup` but uses
-+ the same `--backup-dir` and `--suffix` settings, if any. With
-+ `--backup-dir`, rsync looks for each file's backup dir relative to the
-+ source argument the file came from. Consequently, if the `--backup-dir`
-+ path is relative, each source argument gets a separate backup dir at that
-+ path relative to the argument.
++ [`--remove-source-files`](#opt). This option is independent of
++ [`--backup`](#opt) but uses the same [`--backup-dir`](#opt) and
++ [`--suffix`](#opt) settings, if any. With [`--backup-dir`](#opt), rsync
++ looks for each file's backup dir relative to the source argument the file
++ came from. Consequently, if the [`--backup-dir`](#opt) path is relative,
++ each source argument gets a separate backup dir at that path relative to
++ the argument.
+
0. `--delete`
diff --git a/sender.c b/sender.c
--- a/sender.c
+++ b/sender.c
-@@ -41,6 +41,7 @@ extern int protocol_version;
+@@ -44,6 +44,7 @@ extern int protocol_version;
extern int remove_source_files;
extern int updating_basis_file;
extern int make_backups;
extern int inplace;
extern int inplace_partial;
extern int batch_fd;
-@@ -127,6 +128,7 @@ void successful_send(int ndx)
+@@ -131,6 +132,7 @@ void successful_send(int ndx)
struct file_struct *file;
struct file_list *flist;
STRUCT_STAT st;
if (!remove_source_files)
return;
-@@ -151,7 +153,11 @@ void successful_send(int ndx)
+@@ -162,7 +164,11 @@ void successful_send(int ndx)
return;
}