git.samba.org
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
97bf86f
)
Added Matt's --delete-excluded test for merge-file correctness.
author
Wayne Davison
<wayned@samba.org>
Thu, 31 Aug 2006 17:19:26 +0000
(17:19 +0000)
committer
Wayne Davison
<wayned@samba.org>
Thu, 31 Aug 2006 17:19:26 +0000
(17:19 +0000)
testsuite/delete.test
patch
|
blob
|
history
diff --git
a/testsuite/delete.test
b/testsuite/delete.test
index 93fb60a3b182e4cc8ee1faa809bf3889042362df..58fa82c20a902a942a7423eac09b5b2edc9b0686 100644
(file)
--- 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