The patches for 3.2.4pre3.

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

diff --git a/backup-deleted.diff b/backup-deleted.diff
index a04652a9bb6177f544e88ce0cb746d3f1cc537dc..6f7b20a178bf8312f9539db2153701116a06f49e 100644 (file)
--- a/backup-deleted.diff
+++ b/backup-deleted.diff
@@ -7,7 +7,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: c3b553a93f7090bcbb89c08405f1a5f1c175c864
+based-on: a71cd61970a46bf24afee8d51a28f9e08e873788
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -51,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 },
-@@ -2748,6 +2749,10 @@ void server_options(char **args, int *argc_p)
+@@ -2756,6 +2757,10 @@ void server_options(char **args, int *argc_p)
                args[ac++] = safe_arg("--compress-choice", compress_choice);
  
        if (am_sender) {
@@ -86,7 +86,7 @@ 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
-@@ -342,6 +342,7 @@ has its own detailed description later in this man page.
+@@ -348,6 +348,7 @@ has its own detailed description later in this man page.
  --relative, -R           use relative path names
  --no-implied-dirs        don't send implied dirs with --relative
  --backup, -b             make backups (see --suffix & --backup-dir)
@@ -94,9 +94,9 @@ diff --git a/rsync.1.md b/rsync.1.md
  --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
-@@ -903,6 +904,13 @@ your home directory (remove the '=' for that).
-     enough priority to be effective (e.g., if your rules specify a trailing
-     inclusion/exclusion of `*`, the auto-added rule would never be reached).
+@@ -913,6 +914,13 @@ your home directory (remove the '=' for that).
+     rules specify a trailing inclusion/exclusion of `*`, the auto-added rule
+     would never be reached).
  
 +0.  `--backup-deleted`
 +