Improve --clone-dest.

[rsync-patches.git] / backup-deleted.diff

diff --git a/backup-deleted.diff b/backup-deleted.diff
index 3db0ff1d38b050ab1cb54a241fe11cc67f25575b..1d8dc025eca10c0de7dd7d36b1855b1873ba5630 100644 (file)
--- a/backup-deleted.diff
+++ b/backup-deleted.diff
@@ -7,11 +7,11 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: a3377921ebe651cb7d2b969853cb9fe0e135ff75
+based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
-@@ -1813,7 +1813,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1837,7 +1837,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                goto notify_others;
  
        if (read_batch || whole_file) {
@@ -20,7 +20,7 @@ diff --git a/generator.c b/generator.c
                        if (!(backupptr = get_backup_name(fname)))
                                goto cleanup;
                        if (!(back_file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
-@@ -1849,7 +1849,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1873,7 +1873,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                goto notify_others;
        }
  
@@ -29,7 +29,7 @@ diff --git a/generator.c b/generator.c
                if (!(backupptr = get_backup_name(fname))) {
                        close(fd);
                        goto cleanup;
-@@ -1973,7 +1973,7 @@ int atomic_create(struct file_struct *file, char *fname, const char *slnk, const
+@@ -1997,7 +1997,7 @@ int atomic_create(struct file_struct *file, char *fname, const char *slnk, const
                skip_atomic = 0;
  
        if (del_for_flag) {
@@ -41,15 +41,7 @@ diff --git a/generator.c b/generator.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -741,6 +741,7 @@ void usage(enum logcode F)
-   rprintf(F," -R, --relative              use relative path names\n");
-   rprintf(F,"     --no-implied-dirs       don't send implied dirs with --relative\n");
-   rprintf(F," -b, --backup                make backups (see --suffix & --backup-dir)\n");
-+  rprintf(F,"     --backup-deleted        make backups only of deleted files\n");
-   rprintf(F,"     --backup-dir=DIR        make backups into hierarchy based in DIR\n");
-   rprintf(F,"     --suffix=SUFFIX         set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
-   rprintf(F," -u, --update                skip files that are newer on the receiver\n");
-@@ -1073,7 +1074,8 @@ static struct poptOption long_options[] = {
+@@ -766,7 +766,8 @@ static struct poptOption long_options[] = {
    {"no-i",             0,  POPT_ARG_VAL,    &itemize_changes, 0, 0, 0 },
    {"bwlimit",          0,  POPT_ARG_STRING, &bwlimit_arg, OPT_BWLIMIT, 0, 0 },
    {"no-bwlimit",       0,  POPT_ARG_VAL,    &bwlimit, 0, 0, 0 },
@@ -59,7 +51,7 @@ diff --git a/options.c b/options.c
    {"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 },
-@@ -2817,6 +2819,10 @@ void server_options(char **args, int *argc_p)
+@@ -2726,6 +2727,10 @@ void server_options(char **args, int *argc_p)
        }
  
        if (am_sender) {
@@ -94,15 +86,15 @@ diff --git a/receiver.c b/receiver.c
 diff --git a/rsync.1.md b/rsync.1.md
 --- a/rsync.1.md
 +++ b/rsync.1.md
-@@ -341,6 +341,7 @@ detailed description below for a complete description.
- --relative, -R              use relative path names
- --no-implied-dirs           don't send implied dirs with --relative
- --backup, -b                make backups (see --suffix & --backup-dir)
-+--backup-deleted            make backups only of deleted files
- --backup-dir=DIR            make backups into hierarchy based in DIR
- --suffix=SUFFIX             backup suffix (default ~ w/o --backup-dir)
- --update, -u                skip files that are newer on the receiver
-@@ -831,6 +832,13 @@ your home directory (remove the '=' for that).
+@@ -344,6 +344,7 @@ detailed description below for a complete description.
+ --relative, -R           use relative path names
+ --no-implied-dirs        don't send implied dirs with --relative
+ --backup, -b             make backups (see --suffix & --backup-dir)
++--backup-deleted         make backups only of deleted files
+ --backup-dir=DIR         make backups into hierarchy based in DIR
+ --suffix=SUFFIX          backup suffix (default ~ w/o --backup-dir)
+ --update, -u             skip files that are newer on the receiver
+@@ -856,6 +857,13 @@ your home directory (remove the '=' for that).
      trailing inclusion/exclusion of `*`, the auto-added rule would never be
      reached).
  
@@ -115,11 +107,11 @@ diff --git a/rsync.1.md b/rsync.1.md
 +
  0.  `--backup-dir=DIR`
  
-     In combination with the `--backup` option, this tells rsync to store all
+     This implies the `--backup` option, and tells rsync to store all
 diff --git a/rsync.c b/rsync.c
 --- a/rsync.c
 +++ b/rsync.c
-@@ -699,7 +699,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
+@@ -721,7 +721,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
                goto do_set_file_attrs;
        }