Fixed patch fuzz.

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

diff --git a/filter.diff b/filter.diff
index 862b018..590cda9 100644 (file)
--- a/filter.diff
+++ b/filter.diff
@@ -32,7 +32,7 @@ that's how you can make rules local instead of inherited).
 
 ..wayne..
 
---- orig/clientserver.c        2004-08-02 02:29:16
+--- orig/clientserver.c        2004-11-27 18:27:35
 +++ clientserver.c     2004-08-10 15:44:15
 @@ -48,12 +48,14 @@ extern int no_detach;
  extern int default_af_hint;
@@ -870,9 +870,9 @@ that's how you can make rules local instead of inherited).
                if (link_stat(fname, &st, keep_dirlinks) != 0) {
                        if (f != -1) {
                                io_error |= IOERR_GENERAL;
---- orig/options.c     2004-10-14 17:11:40
+--- orig/options.c     2004-11-27 18:27:35
 +++ options.c  2004-10-14 17:26:10
-@@ -287,6 +287,7 @@ void usage(enum logcode F)
+@@ -296,6 +296,7 @@ void usage(enum logcode F)
    rprintf(F,"     --include=PATTERN       don't exclude files matching PATTERN\n");
    rprintf(F,"     --include-from=FILE     don't exclude patterns listed in FILE\n");
    rprintf(F,"     --files-from=FILE       read FILE for list of source-file names\n");
@@ -880,7 +880,7 @@ that's how you can make rules local instead of inherited).
    rprintf(F," -0, --from0                 all *-from file lists are delimited by nulls\n");
    rprintf(F,"     --version               print version number\n");
    rprintf(F,"     --blocking-io           use blocking I/O for the remote shell\n");
-@@ -380,6 +381,7 @@ static struct poptOption long_options[] 
+@@ -392,6 +393,7 @@ static struct poptOption long_options[] 
    {"ignore-errors",    0,  POPT_ARG_NONE,   &ignore_errors, 0, 0, 0 },
    {"blocking-io",      0,  POPT_ARG_VAL,    &blocking_io, 1, 0, 0 },
    {"no-blocking-io",   0,  POPT_ARG_VAL,    &blocking_io, 0, 0, 0 },
@@ -888,7 +888,7 @@ that's how you can make rules local instead of inherited).
    {0,                 'P', POPT_ARG_NONE,   0, 'P', 0, 0 },
    {"log-format",       0,  POPT_ARG_STRING, &log_format, 0, 0, 0 },
    {"bwlimit",          0,  POPT_ARG_INT,    &bwlimit, 0, 0, 0 },
-@@ -652,6 +654,11 @@ int parse_arguments(int *argc, const cha
+@@ -667,6 +669,11 @@ int parse_arguments(int *argc, const cha
                        am_sender = 1;
                        break;
  
@@ -900,9 +900,9 @@ that's how you can make rules local instead of inherited).
                case 'P':
                        do_progress = 1;
                        keep_partial = 1;
---- orig/rsync.h       2004-10-09 03:21:56
+--- orig/rsync.h       2004-11-27 17:53:24
 +++ rsync.h    2004-09-22 08:48:53
-@@ -109,6 +109,7 @@
+@@ -111,6 +111,7 @@
  #define XFLG_WORDS_ONLY       (1<<2)
  #define XFLG_WORD_SPLIT       (1<<3)
  #define XFLG_DIRECTORY                (1<<4)
@@ -910,7 +910,7 @@ that's how you can make rules local instead of inherited).
  
  #define PERMS_REPORT          (1<<0)
  #define PERMS_SKIP_MTIME      (1<<1)
-@@ -503,11 +504,18 @@ struct map_struct {
+@@ -510,11 +511,18 @@ struct map_struct {
  #define MATCHFLG_INCLUDE      (1<<4) /* this is an include, not an exclude */
  #define MATCHFLG_DIRECTORY    (1<<5) /* this matches only directories */
  #define MATCHFLG_CLEAR_LIST   (1<<6) /* this item is the "!" token */
@@ -930,17 +930,17 @@ that's how you can make rules local instead of inherited).
  };
  
  struct exclude_list_struct {
---- orig/rsync.yo      2004-10-06 00:12:16
+--- orig/rsync.yo      2004-11-27 17:53:24
 +++ rsync.yo   2004-08-13 00:43:31
-@@ -364,6 +364,7 @@ verb(
+@@ -366,6 +366,7 @@ verb(
       --include=PATTERN       don't exclude files matching PATTERN
       --include-from=FILE     don't exclude patterns listed in FILE
       --files-from=FILE       read FILE for list of source-file names
 + -E                          same as --exclude='. -p /.rsync-excludes'
   -0  --from0                 all file lists are delimited by nulls
       --version               print version number
-      --daemon                run as an rsync daemon
-@@ -1037,24 +1038,32 @@ The exclude and include patterns specifi
+      --blocking-io           use blocking I/O for the remote shell
+@@ -1076,24 +1077,32 @@ The exclude and include patterns specifi
  selection of which files to transfer and which files to skip.
  
  Rsync builds an ordered list of include/exclude options as specified on
@@ -981,7 +981,7 @@ that's how you can make rules local instead of inherited).
  
  Let's say that we want to match two source files, one with an absolute
  path of "/home/me/foo/bar", and one with a path of "/home/you/bar/baz".
-@@ -1101,23 +1110,27 @@ because rsync did not descend through th
+@@ -1140,23 +1149,27 @@ because rsync did not descend through th
  hierarchy.
  
  Note also that the --include and --exclude options take one pattern
@@ -1020,7 +1020,7 @@ that's how you can make rules local instead of inherited).
  
    it() if the pattern ends with a / then it will only match a
    directory, not a file, link, or device.
-@@ -1130,22 +1143,31 @@ itemize(
+@@ -1169,22 +1182,31 @@ itemize(
    single asterisk pattern "*" will stop at slashes.
  
    it() if the pattern contains a / (not counting a trailing /) or a "**"
@@ -1056,7 +1056,7 @@ that's how you can make rules local instead of inherited).
  )
  
  The +/- rules are most useful in a list that was read from a file, allowing
-@@ -1192,8 +1214,160 @@ itemize(
+@@ -1231,8 +1253,160 @@ itemize(
    it() --include "*/" --include "*.c" --exclude "*" would include all 
    directories and C source files
    it() --include "foo/" --include "foo/bar.c" --exclude "*" would include