I squished the bug!  Attached is a patch.  The name stands for "Do Not
Elide Merge Files on a Local Receiver with --delete-excluded".

Matt
### Eclipse Workspace Patch 1.0
#P rsync
Index: exclude.c
===================================================================
RCS file: /cvsroot/rsync/exclude.c,v
retrieving revision 1.135
diff -u -r1.135 exclude.c
--- exclude.c	12 Aug 2006 16:22:03 -0000	1.135
+++ exclude.c	31 Aug 2006 00:07:14 -0000
@@ -1102,7 +1102,8 @@
 			elide = am_sender ? 1 : -1;
 		if (ent->match_flags & MATCHFLG_RECEIVER_SIDE)
 			elide = elide ? 0 : am_sender ? -1 : 1;
-		else if (delete_excluded && !elide)
+		else if (!(ent->match_flags & MATCHFLG_MERGE_FILE)
+				&& delete_excluded && !elide)
 			elide = am_sender ? 1 : -1;
 		if (elide < 0) {
 			if (prev)
-- 
To unsubscribe or change options: https://lists.samba.org/mailman/listinfo/rsync
Before posting, read: http://www.catb.org/~esr/faqs/smart-questions.html

Reply via email to