Fixed some failing hunks.

diff --git a/dir-times.diff b/dir-times.diff
index 1b3d384..a2c4f97 100644 (file)
--- a/dir-times.diff
+++ b/dir-times.diff
@@ -1,5 +1,5 @@
---- options.c  6 May 2004 21:08:01 -0000       1.148
-+++ options.c  21 May 2004 08:54:54 -0000
+--- options.c  22 May 2004 06:09:22 -0000      1.151
++++ options.c  22 May 2004 19:31:28 -0000
 @@ -46,6 +46,7 @@ int preserve_devices = 0;
  int preserve_uid = 0;
  int preserve_gid = 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");
-@@ -346,6 +348,7 @@ static struct poptOption long_options[] 
+@@ -347,6 +349,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 },
-@@ -823,6 +826,8 @@ void server_options(char **args,int *arg
+@@ -824,6 +827,8 @@ void server_options(char **args,int *arg
                argstr[x++] = 'D';
        if (preserve_times)
                argstr[x++] = 't';
@@ -36,7 +36,7 @@
                argstr[x++] = 'p';
        if (recurse)
 --- rsync.c    21 May 2004 08:43:03 -0000      1.140
-+++ rsync.c    21 May 2004 08:54:54 -0000
++++ rsync.c    22 May 2004 19:31:28 -0000
 @@ -25,6 +25,7 @@
  extern int verbose;
  extern int dry_run;
@@ -69,8 +69,8 @@
                        rsyserr(FERROR, errno, "failed to set times on %s",
                                full_fname(fname));
                        return 0;
---- rsync.yo   7 May 2004 00:18:37 -0000       1.169
-+++ rsync.yo   21 May 2004 08:54:54 -0000
+--- rsync.yo   21 May 2004 09:44:32 -0000      1.170
++++ rsync.yo   22 May 2004 19:31:29 -0000
 @@ -298,7 +298,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
-@@ -538,14 +539,23 @@ dit(bf(-D, --devices)) This option cause
+@@ -539,14 +540,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.
  
@@ -107,19 +107,19 @@
  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.
  
---- testsuite/chgrp.test       18 May 2004 00:41:35 -0000      1.11
-+++ testsuite/chgrp.test       21 May 2004 08:54:54 -0000
+--- testsuite/chgrp.test       21 May 2004 10:06:09 -0000      1.12
++++ testsuite/chgrp.test       22 May 2004 19:31:29 -0000
 @@ -26,7 +26,7 @@ do
  done
  sleep 2
  
--checkit "$RSYNC -rtgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
-+checkit "$RSYNC -rtdgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
+-checkit "$RSYNC -rtgpvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
++checkit "$RSYNC -rtdgpvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
  
  # The script would have aborted on error, so getting here means we've won.
  exit 0
 --- testsuite/chown.test       18 May 2004 00:41:35 -0000      1.5
-+++ testsuite/chown.test       21 May 2004 08:54:55 -0000
++++ testsuite/chown.test       22 May 2004 19:31:29 -0000
 @@ -28,7 +28,7 @@ chown 5001 "$name2" || test_skipped "Can
  chgrp 5002 "$name1" || test_skipped "Can't chgrp (probably need root)"
  chgrp 5003 "$name2" || test_skipped "Can't chgrp (probably need root)"
@@ -130,7 +130,7 @@
  # The script would have aborted on error, so getting here means we've won.
  exit 0
 --- testsuite/daemon-gzip-download.test        18 May 2004 00:41:51 -0000      1.7
-+++ testsuite/daemon-gzip-download.test        21 May 2004 08:54:55 -0000
++++ testsuite/daemon-gzip-download.test        22 May 2004 19:31:29 -0000
 @@ -29,9 +29,9 @@ export RSYNC_CONNECT_PROG
  hands_setup
  
@@ -144,7 +144,7 @@
  # The script would have aborted on error, so getting here means we've won.
  exit 0
 --- testsuite/daemon-gzip-upload.test  18 May 2004 00:41:51 -0000      1.7
-+++ testsuite/daemon-gzip-upload.test  21 May 2004 08:54:55 -0000
++++ testsuite/daemon-gzip-upload.test  22 May 2004 19:31:29 -0000
 @@ -23,9 +23,9 @@ export RSYNC_CONNECT_PROG
  hands_setup
  
@@ -158,7 +158,7 @@
  # The script would have aborted on error, so getting here means we've won.
  exit 0
 --- testsuite/devices.test     18 May 2004 00:41:35 -0000      1.8
-+++ testsuite/devices.test     21 May 2004 08:54:55 -0000
++++ testsuite/devices.test     22 May 2004 19:31:29 -0000
 @@ -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"
  mknod "$fromdir/block3" b 105 73 || test_skipped "Can't create block device node unless root"
@@ -169,7 +169,7 @@
  # The script would have aborted on error, so getting here means we've won.
  exit 0
 --- testsuite/duplicates.test  18 May 2004 00:41:35 -0000      1.10
-+++ testsuite/duplicates.test  21 May 2004 08:54:55 -0000
++++ testsuite/duplicates.test  22 May 2004 19:31:29 -0000
 @@ -33,7 +33,7 @@ ln -s "$name1" "$name2" || fail "can't c
  
  outfile="$scratchdir/rsync.out"
@@ -179,8 +179,8 @@
      | tee "$outfile"
  
  # Make sure each file was only copied once...
---- testsuite/exclude.test     18 May 2004 00:41:38 -0000      1.6
-+++ testsuite/exclude.test     21 May 2004 08:54:55 -0000
+--- testsuite/exclude.test     22 May 2004 19:29:53 -0000      1.7
++++ testsuite/exclude.test     22 May 2004 19:31:29 -0000
 @@ -63,7 +63,7 @@ EOF
  
  # Create the chk dir with what we expect to be excluded
@@ -220,7 +220,7 @@
  
  # The script would have aborted on error, so getting here means we've won.
 --- testsuite/hands.test       18 May 2004 00:41:46 -0000      1.13
-+++ testsuite/hands.test       21 May 2004 08:54:55 -0000
++++ testsuite/hands.test       22 May 2004 19:31:29 -0000
 @@ -11,19 +11,19 @@ hands_setup
  
  # Main script starts here
@@ -247,7 +247,7 @@
  # The script would have aborted on error, so getting here means we've won.
  exit 0
 --- testsuite/hardlinks.test   18 May 2004 00:41:40 -0000      1.5
-+++ testsuite/hardlinks.test   21 May 2004 08:54:55 -0000
++++ testsuite/hardlinks.test   22 May 2004 19:31:29 -0000
 @@ -31,7 +31,7 @@ ln "$name1" "$name2" || fail "Can't crea
  ln "$name2" "$name3" || fail "Can't create hardlink"
  cp "$name2" "$name4" || fail "Can't copy file"
@@ -258,7 +258,7 @@
  # The script would have aborted on error, so getting here means we've won.
  exit 0
 --- testsuite/longdir.test     18 May 2004 09:47:42 -0000      1.11
-+++ testsuite/longdir.test     21 May 2004 08:54:55 -0000
++++ testsuite/longdir.test     22 May 2004 19:31:29 -0000
 @@ -18,7 +18,7 @@ makepath "$longdir" || test_skipped "una
  touch "$longdir/1" || test_skipped "unable to create files in long directory"
  date > "$longdir/1"
@@ -269,7 +269,7 @@
  # The script would have aborted on error, so getting here means we've won.
  exit 0
 --- testsuite/merge.test       18 May 2004 00:41:38 -0000      1.6
-+++ testsuite/merge.test       21 May 2004 08:54:55 -0000
++++ testsuite/merge.test       22 May 2004 19:31:29 -0000
 @@ -40,9 +40,9 @@ cp -p "$from2dir"/sub1/uno "$from3dir"/s
  cp -p "$from3dir"/sub2/subby "$chkdir"/sub2
  
@@ -283,7 +283,7 @@
  # The script would have aborted on error, so getting here means we've won.
  exit 0
 --- testsuite/ssh-basic.test   18 May 2004 00:41:46 -0000      1.7
-+++ testsuite/ssh-basic.test   21 May 2004 08:54:55 -0000
++++ testsuite/ssh-basic.test   22 May 2004 19:31:29 -0000
 @@ -28,7 +28,7 @@ fi
  # nothing to do.
  hands_setup
@@ -300,7 +300,7 @@
 -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"'
 --- testsuite/unsafe-links.test        18 May 2004 00:41:43 -0000      1.7
-+++ testsuite/unsafe-links.test        21 May 2004 08:54:55 -0000
++++ testsuite/unsafe-links.test        22 May 2004 19:31:29 -0000
 @@ -35,33 +35,33 @@ ln -s ../../unsafe/unsafefile "from/safe
  set -x
  

diff --git a/fuzzy.diff b/fuzzy.diff
index 170c2f3..3568814 100644 (file)
--- a/fuzzy.diff
+++ b/fuzzy.diff
@@ -13,7 +13,7 @@ test suite, but otherwise UNTESTED.]
   Anyone who quotes me in their sig is an idiot. -- Rusty Russell.
 
 --- Makefile.in        15 May 2004 00:48:11 -0000      1.101
-+++ Makefile.in        21 May 2004 09:10:37 -0000
++++ Makefile.in        21 May 2004 09:51:19 -0000
 @@ -32,7 +32,7 @@ ZLIBOBJ=zlib/deflate.o zlib/infblock.o z
        zlib/inflate.o zlib/inftrees.o zlib/infutil.o zlib/trees.o \
        zlib/zutil.o zlib/adler32.o
@@ -24,7 +24,7 @@ test suite, but otherwise UNTESTED.]
        fileio.o batch.o clientname.o
  OBJS3=progress.o pipe.o
 --- generator.c        18 May 2004 08:50:17 -0000      1.85
-+++ generator.c        21 May 2004 09:10:37 -0000
++++ generator.c        21 May 2004 09:51:19 -0000
 @@ -51,6 +51,7 @@ extern int list_only;
  extern int only_existing;
  extern int orig_umask;
@@ -241,8 +241,8 @@ test suite, but otherwise UNTESTED.]
                        (double)st.st_size);
        }
  
---- options.c  6 May 2004 21:08:01 -0000       1.148
-+++ options.c  21 May 2004 09:10:37 -0000
+--- options.c  21 May 2004 09:44:32 -0000      1.150
++++ options.c  21 May 2004 09:51:20 -0000
 @@ -91,6 +91,7 @@ int ignore_errors = 0;
  int modify_window = 0;
  int blocking_io = -1;
@@ -251,23 +251,23 @@ test suite, but otherwise UNTESTED.]
  unsigned int block_size = 0;
  
  
-@@ -290,6 +291,7 @@ void usage(enum logcode F)
-   rprintf(F,"     --bwlimit=KBPS          limit I/O bandwidth, KBytes per second\n");
-   rprintf(F,"     --write-batch=PREFIX    write batch fileset starting with PREFIX\n");
-   rprintf(F,"     --read-batch=PREFIX     read batch fileset starting with PREFIX\n");
-+  rprintf(F,"     --fuzzy                 use similar file as basis if it does't exist\n");
- #ifdef INET6
-   rprintf(F," -4  --ipv4                  prefer IPv4\n");
-   rprintf(F," -6  --ipv6                  prefer IPv6\n");
-@@ -385,6 +387,7 @@ static struct poptOption long_options[] 
-   {"files-from",       0,  POPT_ARG_STRING, &files_from, 0, 0, 0 },
-   {"from0",           '0', POPT_ARG_NONE,   &eol_nulls, 0, 0, 0},
-   {"no-implied-dirs",  0,  POPT_ARG_VAL,    &implied_dirs, 0, 0, 0 },
+@@ -266,6 +267,7 @@ void usage(enum logcode F)
+   rprintf(F," -T  --temp-dir=DIR          create temporary files in directory DIR\n");
+   rprintf(F,"     --compare-dest=DIR      also compare destination files relative to DIR\n");
+   rprintf(F,"     --link-dest=DIR         create hardlinks to DIR for unchanged files\n");
++  rprintf(F,"     --fuzzy                 use similar file as basis if basis doesn't exist\n");
+   rprintf(F," -P                          equivalent to --partial --progress\n");
+   rprintf(F," -z, --compress              compress file data\n");
+   rprintf(F," -C, --cvs-exclude           auto ignore files in the same way CVS does\n");
+@@ -363,6 +365,7 @@ static struct poptOption long_options[] 
+   {"temp-dir",        'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
+   {"compare-dest",     0,  POPT_ARG_STRING, &compare_dest, 0, 0, 0 },
+   {"link-dest",        0,  POPT_ARG_STRING, &compare_dest,  OPT_LINK_DEST, 0, 0 },
 +  {"fuzzy",            0,  POPT_ARG_NONE,   &fuzzy, 0, 0, 0 },
-   {"protocol",         0,  POPT_ARG_INT,    &protocol_version, 0, 0, 0 },
- #ifdef INET6
-   {"ipv4",            '4', POPT_ARG_VAL,    &default_af_hint, AF_INET, 0, 0 },
-@@ -965,6 +968,9 @@ void server_options(char **args,int *arg
+   /* TODO: Should this take an optional int giving the compression level? */
+   {"compress",        'z', POPT_ARG_NONE,   &do_compression, 0, 0, 0 },
+   {"daemon",           0,  POPT_ARG_NONE,   &daemon_opt, 0, 0, 0 },
+@@ -972,6 +975,9 @@ void server_options(char **args,int *arg
                }
        }
  
@@ -278,7 +278,7 @@ test suite, but otherwise UNTESTED.]
        return;
  
 --- receiver.c 21 May 2004 08:27:04 -0000      1.79
-+++ receiver.c 21 May 2004 09:10:37 -0000
++++ receiver.c 21 May 2004 09:51:20 -0000
 @@ -47,6 +47,7 @@ extern int ignore_errors;
  extern int orig_umask;
  extern int keep_partial;
@@ -354,3 +354,13 @@ test suite, but otherwise UNTESTED.]
                } else
                        mapbuf = NULL;
  
+--- rsync.yo   21 May 2004 09:44:32 -0000      1.170
++++ rsync.yo   21 May 2004 09:51:21 -0000
+@@ -324,6 +324,7 @@ verb(
+  -T  --temp-dir=DIR          create temporary files in directory DIR
+      --compare-dest=DIR      also compare received files relative to DIR
+      --link-dest=DIR         create hardlinks to DIR for unchanged files
++     --fuzzy                 use similar file as basis if basis is gone
+  -P                          equivalent to --partial --progress
+  -z, --compress              compress file data
+  -C, --cvs-exclude           auto ignore files in the same way CVS does