Fixed failing hunk.

diff --git a/dir-times.diff b/dir-times.diff
index e6a6aea..3b1072a 100644 (file)
--- a/dir-times.diff
+++ b/dir-times.diff
@@ -1,4 +1,4 @@
---- orig/options.c     2004-07-16 20:07:22
+--- orig/options.c     2004-08-05 21:57:29
 +++ options.c  2004-07-03 20:17:33
 @@ -48,6 +48,7 @@ int preserve_devices = 0;
  int preserve_uid = 0;
@@ -8,7 +8,7 @@
  int update_only = 0;
  int cvs_exclude = 0;
  int dry_run = 0;
-@@ -250,7 +251,8 @@ void usage(enum logcode F)
+@@ -252,7 +253,8 @@ void usage(enum logcode F)
    rprintf(F," -o, --owner                 preserve owner (root only)\n");
    rprintf(F," -g, --group                 preserve group\n");
    rprintf(F," -D, --devices               preserve devices (root only)\n");
@@ -18,7 +18,7 @@
    rprintf(F," -S, --sparse                handle sparse files efficiently\n");
    rprintf(F," -n, --dry-run               show what would have been transferred\n");
    rprintf(F," -W, --whole-file            copy whole files, no incremental checks\n");
-@@ -359,6 +361,7 @@ static struct poptOption long_options[] 
+@@ -362,6 +364,7 @@ static struct poptOption long_options[] 
    {"group",           'g', POPT_ARG_NONE,   &preserve_gid, 0, 0, 0 },
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
    {"times",           't', POPT_ARG_NONE,   &preserve_times, 0, 0, 0 },
@@ -26,7 +26,7 @@
    {"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 },
-@@ -875,6 +878,8 @@ void server_options(char **args,int *arg
+@@ -940,6 +943,8 @@ void server_options(char **args,int *arg
                argstr[x++] = 'D';
        if (preserve_times)
                argstr[x++] = 't';
@@ -35,7 +35,7 @@
        if (preserve_perms)
                argstr[x++] = 'p';
        if (recurse)
---- orig/rsync.c       2004-07-16 20:07:23
+--- orig/rsync.c       2004-08-09 21:07:10
 +++ rsync.c    2004-07-03 20:17:33
 @@ -25,6 +25,7 @@
  extern int verbose;
@@ -45,7 +45,7 @@
  extern int am_root;
  extern int am_sender;
  extern int am_generator;
-@@ -141,15 +142,16 @@ int set_perms(char *fname,struct file_st
+@@ -142,15 +143,16 @@ int set_perms(char *fname,struct file_st
                st = &st2;
        }
  
@@ -69,8 +69,8 @@
                        rsyserr(FERROR, errno, "failed to set times on %s",
                                full_fname(fname));
                        return 0;
---- orig/rsync.yo      2004-07-16 20:07:23
-+++ rsync.yo   2004-07-03 20:17:33
+--- orig/rsync.yo      2004-08-11 17:26:27
++++ rsync.yo   2004-08-11 17:27:51
 @@ -300,7 +300,8 @@ verb(
   -o, --owner                 preserve owner (root only)
   -g, --group                 preserve group
@@ -81,7 +81,7 @@
   -S, --sparse                handle sparse files efficiently
   -n, --dry-run               show what would have been transferred
   -W, --whole-file            copy whole files, no incremental checks
-@@ -556,14 +557,23 @@ dit(bf(-D, --devices)) This option cause
+@@ -566,14 +567,23 @@ dit(bf(-D, --devices)) This option cause
  block device information to the remote system to recreate these
  devices. This option is only available to the super-user.
  
@@ -91,9 +91,9 @@
 +non-directories transferred to the remote system.  Note that if this
  option is not used, the optimization that excludes files that have not been
  modified cannot be effective; in other words, a missing -t or -a will
- cause the next transfer to behave as if it used -I, and all files will have
- their checksums compared and show up in log messages even if they haven't
- changed.
+ cause the next transfer to behave as if it used -I, causing all files to be
+ 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).
  
 +dit(bf(-d, --dir-times)) This tells rsync to preserve the modification
 +times of directories transferred to the remote system.  On a modern
@@ -101,8 +101,8 @@
 +for NFS.
 +
 +Note: when sending files to an older rsync, the --times option will
-+imply --dir-times (if the option causes an error on the receiving
-+system, omit it and use --times to preserve all file/directory times).
++imply --dir-times (if the -d option causes an error on the receiving
++system, omit it and the --times will preserve all file/directory times).
 +
  dit(bf(-n, --dry-run)) This tells rsync to not do any file transfers,
  instead it will just report the actions it would have taken.