Fixed a failing hunk.

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

diff --git a/filter.diff b/filter.diff
index 475870d..1603e4c 100644 (file)
--- a/filter.diff
+++ b/filter.diff
@@ -1109,7 +1109,7 @@ local instead of inherited (see also the 'n' modifier).
  FN_LOCAL_STRING(lp_exclude, exclude)
  FN_LOCAL_STRING(lp_exclude_from, exclude_from)
  FN_LOCAL_STRING(lp_include, include)
---- orig/options.c     2005-01-15 21:23:15
+--- orig/options.c     2005-01-17 23:11:45
 +++ options.c  2005-01-16 23:34:15
 @@ -144,6 +144,7 @@ int list_only = 0;
  char *batch_name = NULL;
@@ -1202,7 +1202,7 @@ local instead of inherited (see also the 'n' modifier).
                case 'P':
                        do_progress = 1;
                        keep_partial = 1;
-@@ -972,7 +996,7 @@ int parse_arguments(int *argc, const cha
+@@ -966,7 +990,7 @@ int parse_arguments(int *argc, const cha
                                partial_dir = NULL;
                        else if (*partial_dir != '/') {
                                add_exclude(&exclude_list, partial_dir,
@@ -1211,18 +1211,9 @@ local instead of inherited (see also the 'n' modifier).
                        }
                        keep_partial = 1;
                }
---- orig/rsync.h       2005-01-15 21:18:09
+--- orig/rsync.h       2005-01-17 23:11:45
 +++ rsync.h    2005-01-17 00:16:04
-@@ -62,7 +62,7 @@
- #define FLAG_MOUNT_POINT (1<<2)       /* sender only */
- 
- /* update this if you make incompatible changes */
--#define PROTOCOL_VERSION 28
-+#define PROTOCOL_VERSION 29
- 
- /* We refuse to interoperate with versions that are not in this range.
-  * Note that we assume we'll work with later versions: the onus is on
-@@ -108,9 +108,11 @@
+@@ -109,9 +109,11 @@
  
  #define XFLG_FATAL_ERRORS     (1<<0)
  #define XFLG_DEF_INCLUDE      (1<<1)
@@ -1235,7 +1226,7 @@ local instead of inherited (see also the 'n' modifier).
  
  #define PERMS_REPORT          (1<<0)
  #define PERMS_SKIP_MTIME      (1<<1)
-@@ -512,11 +514,21 @@ struct map_struct {
+@@ -513,11 +515,21 @@ 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 */
@@ -1258,7 +1249,7 @@ local instead of inherited (see also the 'n' modifier).
  };
  
  struct exclude_list_struct {
---- orig/rsync.yo      2005-01-15 04:36:32
+--- orig/rsync.yo      2005-01-17 23:11:46
 +++ rsync.yo   2005-01-17 07:02:43
 @@ -361,6 +361,9 @@ verb(
   -P                          equivalent to --partial --progress
@@ -1270,7 +1261,7 @@ local instead of inherited (see also the 'n' modifier).
       --exclude=PATTERN       exclude files matching PATTERN
       --exclude-from=FILE     exclude patterns listed in FILE
       --include=PATTERN       don't exclude files matching PATTERN
-@@ -754,14 +757,41 @@ Finally, any file is ignored if it is in
+@@ -756,14 +759,41 @@ Finally, any file is ignored if it is in
  .cvsignore file and matches one of the patterns listed therein.
  See the bf(cvs(1)) manual for more information.
  
@@ -1317,7 +1308,7 @@ local instead of inherited (see also the 'n' modifier).
  
  dit(bf(--exclude-from=FILE)) This option is similar to the --exclude
  option, but instead it adds all exclude patterns listed in the file
-@@ -769,11 +799,11 @@ FILE to the exclude list.  Blank lines i
+@@ -771,11 +801,11 @@ FILE to the exclude list.  Blank lines i
  ';' or '#' are ignored.
  If em(FILE) is bf(-) the list will be read from standard input.
  
@@ -1333,7 +1324,7 @@ local instead of inherited (see also the 'n' modifier).
  
  dit(bf(--include-from=FILE)) This specifies a list of include patterns
  from a file.
-@@ -818,7 +848,8 @@ was located on the remote "src" host.
+@@ -820,7 +850,8 @@ was located on the remote "src" host.
  
  dit(bf(-0, --from0)) This tells rsync that the filenames it reads from a
  file are terminated by a null ('\0') character, not a NL, CR, or CR+LF.
@@ -1343,7 +1334,7 @@ local instead of inherited (see also the 'n' modifier).
  It does not affect --cvs-exclude (since all names read from a .cvsignore
  file are split on whitespace).
  
-@@ -957,8 +988,8 @@ If the partial-dir value is not an absol
+@@ -959,8 +990,8 @@ If the partial-dir value is not an absol
  will prevent partial-dir files from being transferred and also prevent the
  untimely deletion of partial-dir items on the receiving side.  An example:
  the above --partial-dir option would add an "--exclude=.rsync-partial/"
@@ -1354,7 +1345,7 @@ local instead of inherited (see also the 'n' modifier).
  rule for this directory exclusion somewhere higher up in the list so that
  it has a high enough priority to be effective (e.g., if your rules specify
  a trailing --exclude=* rule, the auto-added rule will be ineffective).
-@@ -1108,30 +1139,318 @@ page describing the options available fo
+@@ -1110,30 +1141,318 @@ page describing the options available fo
  
  enddit()
  
@@ -1689,7 +1680,7 @@ local instead of inherited (see also the 'n' modifier).
  
  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".
-@@ -1163,114 +1482,59 @@ verb(
+@@ -1165,114 +1484,59 @@ verb(
     Target file: /dest/you/bar/baz
  )
  
@@ -1842,7 +1833,7 @@ local instead of inherited (see also the 'n' modifier).
  )
  
  manpagesection(BATCH MODE)
-@@ -1439,7 +1703,7 @@ it. The most common cause is incorrectly
+@@ -1441,7 +1705,7 @@ it. The most common cause is incorrectly
  scripts (such as .cshrc or .profile) that contain output statements
  for non-interactive logins.