Fixed a failing hunk.

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

diff --git a/dir-times.diff b/dir-times.diff
index ea39018..214acd7 100644 (file)
--- a/dir-times.diff
+++ b/dir-times.diff
@@ -1,4 +1,4 @@
---- orig/options.c     2004-11-27 17:53:24
+--- orig/options.c     2005-01-17 23:11:45
 +++ options.c  2004-07-03 20:17:33
 @@ -48,6 +48,7 @@ int preserve_devices = 0;
  int preserve_uid = 0;
@@ -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");
-@@ -365,6 +367,7 @@ static struct poptOption long_options[] 
+@@ -366,6 +368,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 },
-@@ -1080,6 +1083,8 @@ void server_options(char **args,int *arg
+@@ -1075,6 +1078,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-09-07 21:45:30
+--- orig/rsync.c       2005-01-10 09:50:46
 +++ rsync.c    2004-07-03 20:17:33
 @@ -25,6 +25,7 @@
  extern int verbose;
@@ -69,7 +69,7 @@
                        rsyserr(FERROR, errno, "failed to set times on %s",
                                full_fname(fname));
                        return 0;
---- orig/rsync.yo      2004-11-27 17:53:24
+--- orig/rsync.yo      2005-01-17 23:11:46
 +++ 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
-@@ -611,14 +612,23 @@ dit(bf(-D, --devices)) This option cause
+@@ -622,14 +623,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.
  
@@ -364,28 +364,25 @@
  
  # The script would have aborted on error, so getting here means we've won.
  exit 0
---- orig/testsuite/merge.test  2004-05-18 09:14:24
-+++ testsuite/merge.test       2004-07-03 20:17:33
-@@ -40,9 +40,9 @@ cp -p "$from2dir"/sub1/uno "$from3dir"/s
- cp -p "$from3dir"/sub2/subby "$chkdir"/sub2
- 
- # Get rid of any directory-time differences
--$RSYNC -av --existing --include='*/' --exclude='*' "$from1dir/" "$from2dir/" "$from3dir/" "$chkdir/"
-+$RSYNC -adv --existing --include='*/' --exclude='*' "$from1dir/" "$from2dir/" "$from3dir/" "$chkdir/"
+--- orig/testsuite/merge.test  2005-01-01 21:11:13
++++ testsuite/merge.test       2005-01-01 21:14:14
+@@ -44,7 +44,7 @@ touch "$from1dir" "$from2dir" "$from3dir
+     "$from2dir"/sub1 "$from3dir"/sub1 "$from3dir"/sub2 \
+     "$chkdir" "$chkdir"/sub1 "$chkdir"/sub2
  
 -checkit "$RSYNC -aHvv \"$from1dir/\" \"$from2dir/\" \"$from3dir/\" \"$todir/\"" "$chkdir" "$todir"
 +checkit "$RSYNC -adHvv \"$from1dir/\" \"$from2dir/\" \"$from3dir/\" \"$todir/\"" "$chkdir" "$todir"
  
  # The script would have aborted on error, so getting here means we've won.
  exit 0
---- orig/testsuite/ssh-basic.test      2004-05-18 09:14:24
-+++ testsuite/ssh-basic.test   2004-07-03 20:17:33
+--- orig/testsuite/ssh-basic.test      2005-01-17 23:11:46
++++ testsuite/ssh-basic.test   2005-01-17 23:18:18
 @@ -28,7 +28,7 @@ fi
  # nothing to do.
  hands_setup
  
--runtest "ssh: basic test" 'checkit "$RSYNC -avH -e ssh --rsync-path=$RSYNC \"$fromdir/\" \"localhost:$todir\"" "$fromdir/" "$todir"'
-+runtest "ssh: basic test" 'checkit "$RSYNC -advH -e ssh --rsync-path=$RSYNC \"$fromdir/\" \"localhost:$todir\"" "$fromdir/" "$todir"'
+-runtest "ssh: basic test" 'checkit "$RSYNC -avH -e ssh --rsync-path=\"$RSYNC\" \"$fromdir/\" \"localhost:$todir\"" "$fromdir/" "$todir"'
++runtest "ssh: basic test" 'checkit "$RSYNC -advH -e ssh --rsync-path=\"$RSYNC\" \"$fromdir/\" \"localhost:$todir\"" "$fromdir/" "$todir"'
  
  # Added by Steve Bonds Feb 2 2003
  # I assumed that "F1" was intended to hold a single file for testing if
@@ -393,8 +390,8 @@
  
  mv "$todir/$F1" "$todir/ThisShouldGo"
  
--runtest "ssh: renamed file" 'checkit "$RSYNC --delete -avH -e ssh --rsync-path=$RSYNC \"$fromdir/\" \"localhost:$todir\"" "$fromdir/" "$todir"'
-+runtest "ssh: renamed file" 'checkit "$RSYNC --delete -advH -e ssh --rsync-path=$RSYNC \"$fromdir/\" \"localhost:$todir\"" "$fromdir/" "$todir"'
+-runtest "ssh: renamed file" 'checkit "$RSYNC --delete -avH -e ssh --rsync-path=\"$RSYNC\" \"$fromdir/\" \"localhost:$todir\"" "$fromdir/" "$todir"'
++runtest "ssh: renamed file" 'checkit "$RSYNC --delete -advH -e ssh --rsync-path=\"$RSYNC\" \"$fromdir/\" \"localhost:$todir\"" "$fromdir/" "$todir"'
 --- orig/testsuite/unsafe-links.test   2004-05-18 09:14:24
 +++ testsuite/unsafe-links.test        2004-07-03 20:17:33
 @@ -35,33 +35,33 @@ ln -s ../../unsafe/unsafefile "from/safe