Updated to apply cleanly.

[rsync-patches.git] / dir-times.diff

diff --git a/dir-times.diff b/dir-times.diff
index 154273721421ac6262cbcb4985eabe4474a2180a..8a725c65398b65d6f51c95c4919a8d0a76df37ee 100644 (file)
--- a/dir-times.diff
+++ b/dir-times.diff
@@ -1,4 +1,4 @@
---- orig/options.c     2004-09-20 05:10:48
+--- orig/options.c     2004-09-23 17:42:07
 +++ options.c  2004-07-03 20:17:33
 @@ -48,6 +48,7 @@ int preserve_devices = 0;
  int preserve_uid = 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 },
-@@ -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';
@@ -69,7 +69,7 @@
                        rsyserr(FERROR, errno, "failed to set times on %s",
                                full_fname(fname));
                        return 0;
---- orig/rsync.yo      2004-09-20 05:10:48
+--- orig/rsync.yo      2004-09-24 16:42:30
 +++ rsync.yo   2004-08-11 17:27:51
 @@ -329,7 +329,8 @@ verb(
   -o, --owner                 preserve owner (root only)
@@ -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
-@@ -595,14 +596,23 @@ dit(bf(-D, --devices)) This option cause
+@@ -602,14 +603,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.
  
@@ -247,11 +247,11 @@
  
  # The script would have aborted on error, so getting here means we've won.
  exit 0
---- orig/testsuite/devices.test        2004-05-18 09:14:24
+--- orig/testsuite/devices.test        2004-09-23 17:42:07
 +++ testsuite/devices.test     2004-07-03 20:17:33
-@@ -29,7 +29,7 @@ mknod "$fromdir/block" b 42 69 || test_s
- mknod "$fromdir/block2" b 42 73 || test_skipped "Can't create block device node unless root"
+@@ -30,7 +30,7 @@ mknod "$fromdir/block2" b 42 73 || test_
  mknod "$fromdir/block3" b 105 73 || test_skipped "Can't create block device node unless root"
+ mkfifo "$fromdir/fifo" || test_skipped "Can't run mkfifo"
  
 -checkit "$RSYNC -aHvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
 +checkit "$RSYNC -adHvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"