Updated to apply cleanly.

[rsync/rsync-patches.git] / backup-dir-dels.diff

diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff
index a8bd9a1..36a3649 100644 (file)
--- a/backup-dir-dels.diff
+++ b/backup-dir-dels.diff
@@ -106,7 +106,7 @@ Marc St-Onge
 +      deleting = 0;
 +      return ret;
 +}
---- orig/generator.c   2005-03-29 01:05:12
+--- orig/generator.c   2005-03-30 16:35:08
 +++ generator.c        2005-03-11 11:22:38
 @@ -85,6 +85,9 @@ extern dev_t filesystem_dev;
  extern char *backup_dir;
@@ -157,7 +157,7 @@ Marc St-Onge
        else
                ok = do_rmdir(fname) == 0;
        if (ok) {
---- orig/options.c     2005-03-28 20:56:55
+--- orig/options.c     2005-03-31 00:24:21
 +++ options.c  2005-03-01 01:25:39
 @@ -127,10 +127,14 @@ int no_detach
  int write_batch = 0;
@@ -282,7 +282,7 @@ Marc St-Onge
        if (make_backups && !backup_dir)
                omit_dir_times = 1;
  
-@@ -1352,6 +1407,10 @@ void server_options(char **args,int *arg
+@@ -1351,6 +1406,10 @@ void server_options(char **args,int *arg
                args[ac++] = "--backup-dir";
                args[ac++] = backup_dir;
        }
@@ -293,7 +293,7 @@ Marc St-Onge
  
        /* Only send --suffix if it specifies a non-default value. */
        if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -1360,7 +1419,13 @@ void server_options(char **args,int *arg
+@@ -1359,7 +1418,13 @@ void server_options(char **args,int *arg
                        goto oom;
                args[ac++] = arg;
        }