Updated to apply cleanly.

[rsync/rsync-patches.git] / link-by-hash.diff

diff --git a/link-by-hash.diff b/link-by-hash.diff
index 377c75b..dcdae7b 100644 (file)
--- a/link-by-hash.diff
+++ b/link-by-hash.diff
@@ -365,7 +365,7 @@ the file's name.
 +}
 +
 +#endif
---- orig/options.c     2005-03-24 16:41:46
+--- orig/options.c     2005-03-28 20:56:55
 +++ options.c  2005-03-01 01:27:55
 @@ -140,6 +140,7 @@ char *log_format = NULL;
  char *password_file = NULL;
@@ -383,7 +383,7 @@ the file's name.
    rprintf(F," -z, --compress              compress file data during the transfer\n");
    rprintf(F," -C, --cvs-exclude           auto-ignore files the same way CVS does\n");
    rprintf(F," -f, --filter=RULE           add a file-filtering RULE\n");
-@@ -359,7 +361,7 @@ void usage(enum logcode F)
+@@ -360,7 +362,7 @@ void usage(enum logcode F)
  enum {OPT_VERSION = 1000, OPT_DAEMON, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
        OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST,
        OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
@@ -392,7 +392,7 @@ the file's name.
        OPT_REFUSED_BASE = 9000};
  
  static struct poptOption long_options[] = {
-@@ -428,6 +430,7 @@ static struct poptOption long_options[] 
+@@ -429,6 +431,7 @@ static struct poptOption long_options[] 
    {"compare-dest",     0,  POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
    {"copy-dest",        0,  POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
    {"link-dest",        0,  POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
@@ -400,7 +400,7 @@ the file's name.
    {"fuzzy",           'y', POPT_ARG_NONE,   &fuzzy_basis, 0, 0, 0 },
    /* TODO: Should this take an optional int giving the compression level? */
    {"compress",        'z', POPT_ARG_NONE,   &do_compression, 0, 0, 0 },
-@@ -862,6 +865,21 @@ int parse_arguments(int *argc, const cha
+@@ -863,6 +866,21 @@ int parse_arguments(int *argc, const cha
                        basis_dir[basis_dir_cnt++] = (char *)arg;
                        break;
  
@@ -422,7 +422,7 @@ the file's name.
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
-@@ -1438,6 +1456,11 @@ void server_options(char **args,int *arg
+@@ -1439,6 +1457,11 @@ void server_options(char **args,int *arg
                }
        }
  
@@ -543,7 +543,7 @@ the file's name.
        if (ret < 0) {
                rsyserr(FERROR, errno, "%s %s -> \"%s\"",
                    ret == -2 ? "copy" : "rename",
---- orig/rsync.h       2005-03-16 02:19:30
+--- orig/rsync.h       2005-03-28 20:56:55
 +++ rsync.h    2004-07-03 20:20:15
 @@ -632,6 +632,14 @@ struct stats {
        int current_file_index;
@@ -560,7 +560,7 @@ the file's name.
  
  #include "byteorder.h"
  #include "lib/mdfour.h"
---- orig/rsync.yo      2005-03-16 02:19:30
+--- orig/rsync.yo      2005-03-28 20:56:55
 +++ rsync.yo   2005-02-13 06:58:47
 @@ -355,6 +355,7 @@ to the detailed description below for a 
       --compare-dest=DIR      also compare received files relative to DIR