Updated to apply cleanly.

[rsync-patches.git] / atimes.diff

diff --git a/atimes.diff b/atimes.diff
index 69365b7640f84c51ee228bd75181c397cd536df7..636a82f95204eed444e56f4a75904c050a428d4a 100644 (file)
--- a/atimes.diff
+++ b/atimes.diff
@@ -4,9 +4,9 @@ command before "make":
     make proto
 
 
---- orig/batch.c       2005-02-16 17:08:13
+--- orig/batch.c       2005-03-01 01:22:58
 +++ batch.c    2004-07-03 20:15:41
-@@ -205,6 +205,8 @@ void show_flist(int index, struct file_s
+@@ -202,6 +202,8 @@ void show_flist(int index, struct file_s
                rprintf(FINFO, "flist->flags=%#x\n", fptr[i]->flags);
                rprintf(FINFO, "flist->modtime=%#lx\n",
                        (long unsigned) fptr[i]->modtime);
@@ -147,7 +147,7 @@ command before "make":
                if (verbose > 1)
                        rprintf(FINFO, "%s is newer\n", safe_fname(fname));
                return;
---- orig/options.c     2005-02-25 18:44:31
+--- orig/options.c     2005-03-01 05:49:24
 +++ options.c  2005-02-21 10:53:28
 @@ -50,6 +50,7 @@ int preserve_uid = 0;
  int preserve_gid = 0;
@@ -173,7 +173,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 },
-@@ -1267,6 +1270,8 @@ void server_options(char **args,int *arg
+@@ -1269,6 +1272,8 @@ void server_options(char **args,int *arg
                argstr[x++] = 'D';
        if (preserve_times)
                argstr[x++] = 't';
@@ -260,7 +260,7 @@ command before "make":
        uid_t uid;
        gid_t gid;
        mode_t mode;
---- orig/rsync.yo      2005-02-28 02:16:55
+--- orig/rsync.yo      2005-03-01 01:22:59
 +++ rsync.yo   2005-01-24 01:57:18
 @@ -322,6 +322,7 @@ to the detailed description below for a 
   -D, --devices               preserve devices (root only)