Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
8c449e6
)
Make sure that --delete-excluded does not elide a per-dir merge
author
Wayne Davison
<wayned@samba.org>
Thu, 31 Aug 2006 17:18:24 +0000
(17:18 +0000)
committer
Wayne Davison
<wayned@samba.org>
Thu, 31 Aug 2006 17:18:24 +0000
(17:18 +0000)
filter file, while still dumping the .cvsignore file from -C.
exclude.c
patch
|
blob
|
blame
|
history
diff --git
a/exclude.c
b/exclude.c
index
fdb5c77
..
dc1a475
100644
(file)
--- a/
exclude.c
+++ b/
exclude.c
@@
-1102,7
+1102,8
@@
static void send_rules(int f_out, struct filter_list_struct *flp)
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 (delete_excluded && !elide
+ && (!(ent->match_flags & MATCHFLG_PERDIR_MERGE) || ent->match_flags & MATCHFLG_CVS_IGNORE))
elide = am_sender ? 1 : -1;
if (elide < 0) {
if (prev)