[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  3417881 Make --delete-excluded work better with --filter=merge.
      from  397fb1a When modifying PATH, export it (for Solaris).

;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 3417881d5cf5358faa9484fb487775f0e8b14556
Author: Wayne Davison <wayned at samba.org>
Date:   Thu Sep 15 07:40:50 2011 -0700

    Make --delete-excluded work better with --filter=merge.

-----------------------------------------------------------------------

Summary of changes:
 exclude.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/exclude.c b/exclude.c
index 16b2a56..faa860f 100644
--- a/exclude.c
+++ b/exclude.c
@@ -1013,13 +1013,9 @@ static filter_rule *parse_rule_tok(const char **rulestr_ptr,
 		exit_cleanup(RERR_SYNTAX);
 	}
 
-	/* --delete-excluded turns an un-modified include/exclude into a
-	 * sender-side rule.  We also affect per-dir merge files that take
-	 * no prefixes as a simple optimization. */
+	/* --delete-excluded turns an un-modified include/exclude into a sender-side rule.  */
 	if (delete_excluded
-	 && !(rule->rflags & FILTRULES_SIDES)
-	 && (!(rule->rflags & FILTRULE_PERDIR_MERGE)
-	  || rule->rflags & FILTRULE_NO_PREFIXES))
+	 && !(rule->rflags & (FILTRULES_SIDES|FILTRULE_MERGE_FILE|FILTRULE_PERDIR_MERGE)))
 		rule->rflags |= FILTRULE_SENDER_SIDE;
 
 	*pat_ptr = (const char *)s;


-- 
The rsync repository.