Fixed some failing hunks.

[rsync/rsync-patches.git] / fuzzy.diff

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