From: Wayne Davison <wayned@samba.org>
Date: Thu, 31 Aug 2006 17:19:26 +0000 (+0000)
Subject: Added Matt's --delete-excluded test for merge-file correctness.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/ff43d8b4493836fd02d99fc376afe33ff22088db

Added Matt's --delete-excluded test for merge-file correctness.
---

diff --git a/testsuite/delete.test b/testsuite/delete.test
index 93fb60a3..58fa82c2 100644
--- a/testsuite/delete.test
+++ b/testsuite/delete.test
@@ -23,5 +23,15 @@ checkit "$RSYNC -avv --remove-sent-files \
 
 diff -r "$chkdir/empty" "$fromdir"
 
+# Make sure that --delete-excluded does not dump a per-dir merge-file filter.
+cat >"$todir/filters" <<EOF
+P foo
+EOF
+touch "$todir/foo"
+
+$RSYNC -r --filter=': filters' --delete-excluded "$fromdir/" "$todir/"
+
+test -f "$todir/foo" || test_fail "rsync incorrectly elided the merge file"
+
 # The script would have aborted on error, so getting here means we've won.
 exit 0