The patches for 3.2.4pre3.

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

diff --git a/filter-attribute-mods.diff b/filter-attribute-mods.diff
index c04d33ceed4a7a3202543de00834b3de1d164807..2ed37e8159cc777b61d239d7bb567f1b16f68c30 100644 (file)
--- a/filter-attribute-mods.diff
+++ b/filter-attribute-mods.diff
@@ -9,7 +9,7 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
-based-on: c3b553a93f7090bcbb89c08405f1a5f1c175c864
+based-on: cc832943160fb2cbaeaf45942b724828399edd37
 diff --git a/exclude.c b/exclude.c
 --- a/exclude.c
 +++ b/exclude.c
@@ -336,7 +336,7 @@ diff --git a/flist.c b/flist.c
 diff --git a/rsync.1.md b/rsync.1.md
 --- a/rsync.1.md
 +++ b/rsync.1.md
-@@ -1406,7 +1406,9 @@ your home directory (remove the '=' for that).
+@@ -1416,7 +1416,9 @@ your home directory (remove the '=' for that).
      >     --chmod=D2775,F664
  
      It is also legal to specify multiple `--chmod` options, as each additional
@@ -347,7 +347,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  
      See the [`--perms`](#opt) and [`--executability`](#opt) options for how the
      resulting permission value can be applied to the files in the transfer.
-@@ -2813,6 +2815,10 @@ your home directory (remove the '=' for that).
+@@ -2838,6 +2840,10 @@ your home directory (remove the '=' for that).
      avoid a complaint about wildcard characters, but a modern rsync handles
      this automatically.
  
@@ -358,7 +358,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  0.  `--timeout=SECONDS`
  
      This option allows you to set a maximum I/O timeout in seconds.  If no data
-@@ -3859,6 +3865,15 @@ The following modifiers are accepted after a "`+`" or "`-`":
+@@ -3893,6 +3899,15 @@ The following modifiers are accepted after a "`+`" or "`-`":
    like "CVS" and "`*.o`" are marked as perishable, and will not prevent a
    directory that was removed on the source from being deleted on the
    destination.
@@ -374,7 +374,7 @@ diff --git a/rsync.1.md b/rsync.1.md
  - An `x` indicates that a rule affects xattr names in xattr copy/delete
    operations (and is thus ignored when matching file/dir names).  If no
    xattr-matching rules are specified, a default xattr filtering rule is used
-@@ -3916,6 +3931,12 @@ The following modifiers are accepted after a merge or dir-merge rule:
+@@ -3950,6 +3965,12 @@ The following modifiers are accepted after a merge or dir-merge rule:
    rules in the file must not specify sides (via a modifier or a rule prefix
    such as `hide`).