From: Wayne Davison <wayned@samba.org>
Date: Sun, 6 Feb 2005 07:27:39 +0000 (+0000)
Subject: Fixed a failing hunk.
X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/commitdiff_plain/34ec332e845878afc9e06182c032f0d2821c1ca6

Fixed a failing hunk.
---

diff --git a/sender-receiver-excludes.diff b/sender-receiver-excludes.diff
index ee42f25..30e6280 100644
--- a/sender-receiver-excludes.diff
+++ b/sender-receiver-excludes.diff
@@ -199,8 +199,8 @@ See the updated manpage for the details.
  
  struct filter_struct {
  	struct filter_struct *next;
---- orig/rsync.yo	2005-02-05 01:23:49
-+++ rsync.yo	2005-02-05 05:31:11
+--- orig/rsync.yo	2005-02-06 07:24:23
++++ rsync.yo	2005-02-06 07:21:31
 @@ -678,7 +678,9 @@ send the whole directory (e.g. "dir" or 
  for the directory's contents (e.g. "dir/*") since the wildcard is expanded
  by the shell and rsync thus gets a request to transfer individual files, not
@@ -231,14 +231,12 @@ See the updated manpage for the details.
  bf(!) clears the current include/exclude list (takes no arg) nl()
  )
  
-@@ -1263,10 +1270,17 @@ comment lines that start with a "#".
+@@ -1263,8 +1270,13 @@ comment lines that start with a "#".
  
  manpagesection(INCLUDE/EXCLUDE PATTERN RULES)
  
 -You can include and exclude files by specifying patterns using the "+" and
--"-" filter rules (as introduced in the FILTER RULES section above).  These
--rules specify a pattern that is matched against the names of the files
--that are going to be transferred.  These patterns can take several forms:
+-"-" filter rules (as introduced in the FILTER RULES section above).
 +You can include and exclude files by specifying patterns using the "+",
 +"-", "H", and "P" filter rules (as introduced in the FILTER RULES section
 +above).
@@ -246,24 +244,21 @@ See the updated manpage for the details.
 +rule with an "s" modifier (a sender-only exclusion) and "P" (protect) is
 +just a more intuitive way to specify a "-" rule with an "r" modifier (a
 +receiver-only exclusion).  See the modifiers below for more information.
-+
-+The include/exclude rules each specify a pattern that is matched against
-+the names of the files that are going to be transferred.  These patterns
-+can take several forms:
  
- itemize(
-   it() if the pattern starts with a / then it is anchored to a
-@@ -1398,6 +1412,9 @@ itemize(
-   space that separates the prefix from the rule is treated specially, so
-   "- foo + bar" is parsed as two rules (assuming that bf(-) or bf(+) was not
+ The include/exclude rules each specify a pattern that is matched against
+ the names of the files that are going to be transferred.  These patterns
+@@ -1402,7 +1414,9 @@ itemize(
    specified to turn off the parsing of prefixes).
-+  it() You may also specify any of the modifiers for "+" or "-" to have the
-+  rules that are read-in default to having that option set.  For instance,
-+  ":s_.excl" would make all the rules in .excl server-side only.
+   it() You may also specify any of the modifiers for "+" or "-" to have the
+   rules that are read-in default to having that option set.  For instance,
+-  ".-/_.excl" would treat the contents of .excl as absolute-path excludes.
++  ".-/_.excl" would treat the contents of .excl as absolute-path excludes,
++  while ":s_.filt" and ":Cs" would each make all their per-directory
++  rules apply only on the server side.
  )
  
  The following modifiers are accepted after a "+" or "-":
-@@ -1413,6 +1430,16 @@ itemize(
+@@ -1418,6 +1432,16 @@ itemize(
    it() A bf(C) is used to indicate that all the global CVS-exclude rules
    should be inserted as excludes in place of the "-C".  No arg should
    follow.
@@ -280,18 +275,3 @@ See the updated manpage for the details.
  )
  
  Per-directory rules are inherited in all subdirectories of the directory
-@@ -1706,10 +1733,10 @@ error.
- When reading a batch file, rsync will force the value of certain options
- to match the data in the batch file if you didn't set them to the same
- as the batch-writing command.  Other options can (and should) be changed.
--For instance
--bf(--write-batch) changes to bf(--read-batch), bf(--files-from) is dropped, and the
--bf(--filter)/bf(--include)/bf(--exclude) options are not needed unless one of the
--bf(--delete) options is specified without bf(--delete-excluded).
-+For instance bf(--write-batch) changes to bf(--read-batch),
-+bf(--files-from) is dropped, and the
-+bf(--filter)/bf(--include)/bf(--exclude) options are not needed unless
-+one of the bf(--delete) options is specified.
- 
- The code that creates the BATCH.sh file transforms any filter/include/exclude
- options into a single list that is appended as a "here" document to the