-- Matt McCutchen <hashproduct@gmail.com>
-based-on: 05fce6582a9192c58b2107153ec00056fd120d14
+based-on: 8b1b81e054bdcc927ff26f20f424e034bd273175
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
-@@ -33,6 +33,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
-@@ -728,6 +729,7 @@ void usage(enum logcode F)
- rprintf(F," --existing skip creating new files on receiver\n");
- rprintf(F," --ignore-existing skip updating files that already exist on receiver\n");
- rprintf(F," --remove-source-files sender removes synchronized files (non-dirs)\n");
-+ rprintf(F," --source-backup ... and backs up those files\n");
- rprintf(F," --del an alias for --delete-during\n");
- rprintf(F," --delete delete extraneous files from destination dirs\n");
- rprintf(F," --delete-before receiver deletes before transfer, not during\n");
-@@ -990,6 +992,7 @@ static struct poptOption long_options[] = {
+@@ -776,6 +777,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 },
-@@ -2614,6 +2617,8 @@ void server_options(char **args, int *argc_p)
- goto oom;
- args[ac++] = arg;
- }
+@@ -2818,6 +2820,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";
}
- /* --delete-missing-args needs the cooperation of both sides, but
-diff --git a/rsync.yo b/rsync.yo
---- a/rsync.yo
-+++ b/rsync.yo
-@@ -384,6 +384,7 @@ to the detailed description below for a complete description. verb(
- --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)
-+ --source-backup ... and backs up those files
- --del an alias for --delete-during
- --delete delete extraneous files from dest dirs
- --delete-before receiver deletes before xfer, not during
-@@ -1310,6 +1311,14 @@ bf(--exclude='*.new') for the rsync transfer).
- 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.
+ 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
+@@ -441,6 +441,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)
++--source-backup ... and backs up those files
+ --del an alias for --delete-during
+ --delete delete extraneous files from dest dirs
+ --delete-before receiver deletes before xfer, not during
+@@ -1843,6 +1844,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.
-+dit(bf(--source-backup)) Makes the sender back up the source files it removes
-+due to bf(--remove-source-files). This option is independent of
-+bf(--backup) but uses the same bf(--backup-dir) and bf(--suffix) settings,
-+if any. With bf(--backup-dir), rsync looks for each file's backup dir relative
-+to the source argument the file came from. Consequently, if the
-+bf(--backup-dir) path is relative, each source argument gets a separate backup
-+dir at that path relative to the argument.
++0. `--source-backup`
+
- dit(bf(--delete)) This tells rsync to delete extraneous files from the
- receiving side (ones that aren't on the sending side), but only for the
- directories that are being synchronized. You must have asked rsync to
++ Makes the sender back up the source files it removes due to
++ [`--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`
+
+ This tells rsync to delete extraneous files from the receiving side (ones
diff --git a/sender.c b/sender.c
--- a/sender.c
+++ b/sender.c
-@@ -39,6 +39,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 make_source_backups;
extern int inplace;
+ extern int inplace_partial;
extern int batch_fd;
- extern int write_batch;
-@@ -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;
}
git.samba.org / rsync-patches.git / blobdiff