Updated to apply cleanly.

[rsync/rsync-patches.git] / atimes.diff

diff --git a/atimes.diff b/atimes.diff
index a023be9..51c34da 100644 (file)
--- a/atimes.diff
+++ b/atimes.diff
@@ -148,7 +148,7 @@ command before "make":
                if (verbose > 1)
                        rprintf(FINFO, "%s is newer\n", safe_fname(fname));
                return;
---- orig/options.c     2004-09-20 05:10:48
+--- orig/options.c     2004-09-23 17:42:07
 +++ options.c  2004-07-03 20:15:41
 @@ -48,6 +48,7 @@ int preserve_devices = 0;
  int preserve_uid = 0;
@@ -174,7 +174,7 @@ command before "make":
    {"checksum",        'c', POPT_ARG_NONE,   &always_checksum, 0, 0, 0 },
    {"verbose",         'v', POPT_ARG_NONE,   0,               'v', 0, 0 },
    {"quiet",           'q', POPT_ARG_NONE,   0,               'q', 0, 0 },
-@@ -946,6 +949,8 @@ void server_options(char **args,int *arg
+@@ -950,6 +953,8 @@ void server_options(char **args,int *arg
                argstr[x++] = 'D';
        if (preserve_times)
                argstr[x++] = 't';
@@ -230,7 +230,7 @@ command before "make":
        }
  
        change_uid = am_root && preserve_uid && st->st_uid != file->uid;
---- orig/rsync.h       2004-08-03 15:41:32
+--- orig/rsync.h       2004-09-22 08:47:31
 +++ rsync.h    2004-07-03 20:15:41
 @@ -54,6 +54,7 @@
  #define XMIT_HAS_IDEV_DATA (1<<9)
@@ -240,7 +240,7 @@ command before "make":
  
  /* These flags are used in the live flist data. */
  
-@@ -111,6 +112,7 @@
+@@ -112,6 +113,7 @@
  
  #define PERMS_REPORT          (1<<0)
  #define PERMS_SKIP_MTIME      (1<<1)
@@ -248,7 +248,7 @@ command before "make":
  
  #define FULL_FLUSH    1
  #define NORMAL_FLUSH  0
-@@ -425,6 +427,7 @@ struct file_struct {
+@@ -426,6 +428,7 @@ struct file_struct {
                struct hlink *links;
        } link_u;
        time_t modtime;
@@ -256,7 +256,7 @@ command before "make":
        uid_t uid;
        gid_t gid;
        mode_t mode;
---- orig/rsync.yo      2004-09-20 05:10:48
+--- orig/rsync.yo      2004-09-24 16:42:30
 +++ rsync.yo   2004-07-03 20:15:41
 @@ -330,6 +330,7 @@ verb(
   -g, --group                 preserve group
@@ -266,7 +266,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,11 @@ cause the next transfer to behave as if 
+@@ -610,6 +611,11 @@ 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).
  
@@ -346,7 +346,7 @@ command before "make":
      if [ -z "$failed" ] ; then
        return 0
      else
---- orig/tls.c 2004-05-15 20:10:13
+--- orig/tls.c 2004-09-23 05:45:24
 +++ tls.c      2004-07-03 20:15:41
 @@ -39,6 +39,7 @@