Updated to apply cleanly.

[rsync/rsync-patches.git] / chmod-option.diff

diff --git a/chmod-option.diff b/chmod-option.diff
index 7e22aeb..1d370d8 100644 (file)
--- a/chmod-option.diff
+++ b/chmod-option.diff
@@ -225,7 +225,7 @@ command before "make":
        file->uid = st.st_uid;
        file->gid = st.st_gid;
  
---- orig/options.c     2004-09-20 05:10:48
+--- orig/options.c     2004-09-23 17:42:07
 +++ options.c  2004-07-03 20:13:41
 @@ -126,6 +126,7 @@ char *log_format = NULL;
  char *password_file = NULL;
@@ -274,7 +274,7 @@ command before "make":
        if (do_progress && !verbose)
                verbose = 1;
  
-@@ -1083,6 +1095,11 @@ void server_options(char **args,int *arg
+@@ -1087,6 +1099,11 @@ void server_options(char **args,int *arg
                args[ac++] = compare_dest;
        }
  
@@ -286,7 +286,7 @@ command before "make":
        if (files_from && (!am_sender || remote_filesfrom_file)) {
                if (remote_filesfrom_file) {
                        args[ac++] = "--files-from";
---- orig/rsync.yo      2004-09-20 05:10:48
+--- orig/rsync.yo      2004-09-24 16:42:30
 +++ rsync.yo   2004-07-03 20:13:41
 @@ -330,6 +330,7 @@ verb(
   -g, --group                 preserve group
@@ -296,7 +296,7 @@ command before "make":
   -S, --sparse                handle sparse files efficiently
   -n, --dry-run               show what would have been transferred
   -W, --whole-file            copy whole files, no incremental checks
-@@ -603,6 +604,14 @@ cause the next transfer to behave as if 
+@@ -610,6 +611,14 @@ cause the next transfer to behave as if 
  updated (though the rsync algorithm will make the update fairly efficient
  if the files haven't actually changed, you're much better off using -t).